diff --git a/[refs] b/[refs]
index 8584fcde779e..8706e3f8f920 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9d21d7f5ae1e625f3687d88bb50b00478c533ad
+refs/heads/master: 863842736fb4571b22e0f7f4696bf13eeec57166
diff --git a/trunk/drivers/gpu/drm/drm_drawable.c b/trunk/drivers/gpu/drm/drm_drawable.c
index 1839c57663c5..70b15d1b8f54 100644
--- a/trunk/drivers/gpu/drm/drm_drawable.c
+++ b/trunk/drivers/gpu/drm/drm_drawable.c
@@ -111,7 +111,9 @@ int drm_update_drawable_info(struct drm_device *dev, void *data, struct drm_file
 
 	switch (update->type) {
 	case DRM_DRAWABLE_CLIPRECTS:
-		if (update->num != info->num_rects) {
+		if (update->num == 0)
+			rects = NULL;
+		else if (update->num != info->num_rects) {
 			rects = drm_alloc(update->num * sizeof(struct drm_clip_rect),
 					 DRM_MEM_BUFS);
 		} else