Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / gpu / drm / drm_drawable.c

diff --git a/drivers/gpu/drm/drm_drawable.c b/drivers/gpu/drm/drm_drawable.c
index 4a794d89942bc34261eeeee1bd8d5e5b29ebf5a3..80be1cab62afe77bc386bb39f1e0ca92113e4206 100644 (file)
--- a/drivers/gpu/drm/drm_drawable.c
+++ b/drivers/gpu/drm/drm_drawable.c
@@ -81,6 +81,10 @@ int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv)
        spin_lock_irqsave(&dev->drw_lock, irqflags);
 
        info = drm_get_drawable_info(dev, draw->handle);
+       if (info == NULL) {
+               spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+               return -EINVAL;
+       }
        drm_free(info->rects, info->num_rects * sizeof(struct drm_clip_rect),
                        DRM_MEM_BUFS);
        drm_free(info, sizeof(struct drm_drawable_info), DRM_MEM_BUFS);