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

• Lines: 20
• Date: Fri Feb 9 11:40:02 2001
• Orig file: v2.4.1/linux/drivers/ide/ide-features.c
• Orig date: Mon Oct 16 12:21:40 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/ide/ide-features.c linux/drivers/ide/ide-features.c
@@ -27,7 +27,7 @@
 #include <linux/errno.h>
 #include <linux/genhd.h>
 #include <linux/blkpg.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/hdreg.h>
@@ -189,6 +189,10 @@
 	__cli();		/* local CPU only; some systems need this */
 	SELECT_MASK(HWIF(drive), drive, 0);
 	id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC);
+	if (!id) {
+		__restore_flags(flags);	/* local CPU only */
+		return 0;
+	}
 	ide_input_data(drive, id, SECTOR_WORDS);
 	(void) GET_STAT();	/* clear drive IRQ */
 	ide__sti();		/* local CPU only */