diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/alpha/kernel/core_marvel.c | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/alpha/kernel/core_marvel.c')
| -rw-r--r-- | arch/alpha/kernel/core_marvel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index 8e059e58b0ac..53dd2f1a53aa 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c | |||
| @@ -1103,6 +1103,8 @@ marvel_agp_info(void) | |||
| 1103 | * Allocate the info structure. | 1103 | * Allocate the info structure. |
| 1104 | */ | 1104 | */ |
| 1105 | agp = kmalloc(sizeof(*agp), GFP_KERNEL); | 1105 | agp = kmalloc(sizeof(*agp), GFP_KERNEL); |
| 1106 | if (!agp) | ||
| 1107 | return NULL; | ||
| 1106 | 1108 | ||
| 1107 | /* | 1109 | /* |
| 1108 | * Fill it in. | 1110 | * Fill it in. |