patch-2.4.2 linux/drivers/ide/ide-probe.c

• Lines: 18
• Date: Fri Feb 9 11:30:23 2001
• Orig file: v2.4.1/linux/drivers/ide/ide-probe.c
• Orig date: Sat Feb 3 19:51:27 2001

diff -u --recursive --new-file v2.4.1/linux/drivers/ide/ide-probe.c linux/drivers/ide/ide-probe.c
@@ -40,7 +40,7 @@
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/genhd.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/spinlock.h>
@@ -652,6 +652,8 @@
 		hwgroup = match->hwgroup;
 	} else {
 		hwgroup = kmalloc(sizeof(ide_hwgroup_t), GFP_KERNEL);
+		if (!hwgroup)
+			return 1;
 		memset(hwgroup, 0, sizeof(ide_hwgroup_t));
 		hwgroup->hwif     = hwif->next = hwif;
 		hwgroup->rq       = NULL;