diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 20:58:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 20:58:09 -0500 |
| commit | dbc39ec4b69de34e2c2c937131649cc4a104283f (patch) | |
| tree | 23a034fb6994c91289adc830e33ced1d2618d04f /drivers/gpu/drm/drm_irq.c | |
| parent | 4f427634b127f5fdc4e9fd2e5780f0a6caef936b (diff) | |
| parent | 467a29ea5ad1c1e3b1ffd6aab1166331fcd39361 (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.
drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 53120a72a48c..28d1d3c24d65 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -1012,7 +1012,8 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, | |||
| 1012 | struct drm_file *file_priv) | 1012 | struct drm_file *file_priv) |
| 1013 | { | 1013 | { |
| 1014 | struct drm_modeset_ctl *modeset = data; | 1014 | struct drm_modeset_ctl *modeset = data; |
| 1015 | int crtc, ret = 0; | 1015 | int ret = 0; |
| 1016 | unsigned int crtc; | ||
| 1016 | 1017 | ||
| 1017 | /* If drm_vblank_init() hasn't been called yet, just no-op */ | 1018 | /* If drm_vblank_init() hasn't been called yet, just no-op */ |
| 1018 | if (!dev->num_crtcs) | 1019 | if (!dev->num_crtcs) |