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

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

diff -u --recursive --new-file v2.4.1/linux/drivers/ide/ide-cd.c linux/drivers/ide/ide-cd.c
@@ -302,7 +302,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/cdrom.h>
@@ -1871,6 +1871,9 @@
 	/* Check to see if the existing data is still valid.
 	   If it is, just return. */
 	(void) cdrom_check_status(drive, sense);
+
+	if (CDROM_STATE_FLAGS(drive)->toc_valid)
+		return 0;
 
 	/* First read just the header, so we know how long the TOC is. */
 	stat = cdrom_read_tocentry(drive, 0, 1, 0, (char *) &toc->hdr,