From ad32e3c9222d9a186b6b78b244638ee301846ba7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 15 Jul 2010 10:39:47 +0200 Subject: [PATCH] --- yaml --- r: 201115 b: refs/heads/master c: 772a2f9b488f4d27c314da5eeabde750b9ead41b h: refs/heads/master i: 201113: bb9a3e511b9674605d42a3f2170e108be663484f 201111: 107b99b776b4d01f9cba1474e3c1ddb5a787c7d5 v: v3 --- [refs] | 2 +- trunk/include/linux/fb.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 55d9c4fbfb33..a72c2874bbcc 100644 --- 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 index 8e5a9dfb76bf..e7445df44d6c 100644 --- 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; }