diff --git a/[refs] b/[refs]
index 4ab90736bca6..49f702ca8355 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53c379e9462b59d4e166429ff064aaf0e7743795
+refs/heads/master: 08932156cc2d4f8807dc5ca5c3d6ccd85080610a
diff --git a/trunk/drivers/gpu/drm/radeon/r600_cp.c b/trunk/drivers/gpu/drm/radeon/r600_cp.c
index 37249b26f836..f915f1153b41 100644
--- a/trunk/drivers/gpu/drm/radeon/r600_cp.c
+++ b/trunk/drivers/gpu/drm/radeon/r600_cp.c
@@ -121,6 +121,9 @@ void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
 	int pages;
 	int i;
 
+	if (!entry)
+		return;
+
 	if (gart_info->bus_addr) {
 		max_pages = (gart_info->table_size / sizeof(u32));
 		pages = (entry->pages <= max_pages)