summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-20 18:29:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-20 18:29:25 -0700
commitf4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96 (patch)
treecadf0fd7e2bcb2d2d2402fcddbda3ec9b53b2c0c /include
parente0959371b4aaddb9b986019d5cfef93f9801d0ff (diff)
parentc42750b0261274107ae85c894c088e618a3e38b9 (diff)
downloadlinux-f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96.tar.gz
linux-f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96.tar.bz2
linux-f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96.zip
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/r600: fix possible NULL pointer derefernce drm/radeon/kms: add quirk for ASUS HD 3600 board include/linux/vgaarb.h: add missing part of include guard drm/nouveau: Fix crashes during fbcon init on single head cards. drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch drm/radeon/kms: fix shared ddc harder drm/i915: enable low power render writes on GEN3 hardware. drm/i915: Define MI_ARB_STATE bits vmwgfx: return -EFAULT if copy_to_user fails fb: handle allocation failure in alloc_apertures() drm: radeon: check kzalloc() result drm/ttm: Fix build on architectures without AGP drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740 drm/radeon/kms: fix legacy tv-out pal mode
Diffstat (limited to 'include')
-rw-r--r--include/linux/fb.h2
-rw-r--r--include/linux/vgaarb.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 8e5a9dfb76bf..e7445df44d6c 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;
}
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index c9a975976995..814f294d4cd0 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -29,6 +29,7 @@
*/
#ifndef LINUX_VGA_H
+#define LINUX_VGA_H
#include <asm/vga.h>