---

yaml --- r: 201115 b: refs/heads/master c: 772a2f9 h: refs/heads/master i: 201113: bb9a3e5 201111: 107b99b v: v3
git-mirror · Jul 20, 2010 · ad32e3c · ad32e3c
1 parent 4a325c5
commit ad32e3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbb642f9c9a43dbe45ffe14935397a2a34100263
+refs/heads/master: 772a2f9b488f4d27c314da5eeabde750b9ead41b
diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h
@@ -873,6 +873,8 @@ struct fb_info {
 static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
 	struct apertures_struct *a = kzalloc(sizeof(struct apertures_struct)
 			+ max_num * sizeof(struct aperture), GFP_KERNEL);
+	if (!a)
+		return NULL;
 	a->count = max_num;
 	return a;
 }