From 6fc253a75e38cb44d014dfd3129138db7846028c Mon Sep 17 00:00:00 2001 From: "akpm@osdl.org" Date: Tue, 2 Jan 2007 14:44:31 -0800 Subject: [PATCH] --- yaml --- r: 45198 b: refs/heads/master c: 7b37b064c294af350c462f77d7a9a44485a93684 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/sgi-agp.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 36d582bcaca7..335f6cceaf62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f02d687b44aba0cfc393102ea1ccc78eadf8a04 +refs/heads/master: 7b37b064c294af350c462f77d7a9a44485a93684 diff --git a/trunk/drivers/char/agp/sgi-agp.c b/trunk/drivers/char/agp/sgi-agp.c index d73be4c2db8a..902648db7efa 100644 --- a/trunk/drivers/char/agp/sgi-agp.c +++ b/trunk/drivers/char/agp/sgi-agp.c @@ -281,10 +281,11 @@ static int __devinit agp_sgi_init(void) else return 0; - sgi_tioca_agp_bridges = - (struct agp_bridge_data **)kmalloc(tioca_gart_found * - sizeof(struct agp_bridge_data *), - GFP_KERNEL); + sgi_tioca_agp_bridges = kmalloc(tioca_gart_found * + sizeof(struct agp_bridge_data *), + GFP_KERNEL); + if (!sgi_tioca_agp_bridges) + return -ENOMEM; j = 0; list_for_each_entry(info, &tioca_list, ca_list) {