diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
| commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
| tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /include/linux/fb.h | |
| parent | 392c57a2ec811db37ae45adc513704cf92ba3e69 (diff) | |
| parent | cccf59abea4e1c36322e365d6e61ff7de1f3ee07 (diff) | |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 8e5a9dfb76b..e7445df44d6 100644 --- a/include/linux/fb.h +++ b/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; } |