diff --git a/[refs] b/[refs]
index 9669f299596c..d2e3b70dc8ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff846ab7f76ffecba4f0bef026163d2a2364d7d0
+refs/heads/master: 1ae70072f0699916c1a77a9bacad958ee46f7395
diff --git a/trunk/drivers/gpu/drm/drm_proc.c b/trunk/drivers/gpu/drm/drm_proc.c
index bbd4b3d1074a..dc967af7a33c 100644
--- a/trunk/drivers/gpu/drm/drm_proc.c
+++ b/trunk/drivers/gpu/drm/drm_proc.c
@@ -106,6 +106,10 @@ int drm_proc_create_files(struct drm_info_list *files, int count,
 			continue;
 
 		tmp = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL);
+		if (tmp == NULL) {
+			ret = -1;
+			goto fail;
+		}
 		ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root);
 		if (!ent) {
 			DRM_ERROR("Cannot create /proc/dri/%s/%s\n",