patch-2.2.11 linux/drivers/block/ide-cd.c

• Lines: 31
• Date: Mon Aug 9 12:04:38 1999
• Orig file: v2.2.10/linux/drivers/block/ide-cd.c
• Orig date: Mon Apr 12 16:18:26 1999

diff -u --recursive --new-file v2.2.10/linux/drivers/block/ide-cd.c linux/drivers/block/ide-cd.c
@@ -2121,20 +2121,23 @@
 				 msf.cdmsf_frame0);
 
 		/* Make sure the TOC is up to date. */
-		stat = cdrom_read_toc (drive, NULL);
-		if (stat) return stat;
+		if (cmd != CDROMREADRAW) {
+			stat = cdrom_read_toc (drive, NULL);
+			if (stat) 
+				return stat;
 
-		toc = info->toc;
+			toc = info->toc;
 
-		if (lba < 0 || lba >= toc->capacity)
-			return -EINVAL;
+			if (lba < 0 || lba >= toc->capacity)
+				return -EINVAL;
+		}
 
 		buf = (char *) kmalloc (blocksize, GFP_KERNEL);
 		if (buf == NULL)
 			return -ENOMEM;
 
-		stat = cdrom_read_block (drive, format, lba, 1, buf, blocksize,
-					 NULL);
+		stat = cdrom_read_block (drive, format, lba, 1, buf,
+					 blocksize, NULL);
 
 		if (stat == 0) {
 			if (cmd == CDROMREADMODE2) {