patch-2.4.0-test10 linux/drivers/scsi/sr.c

• Lines: 22
• Date: Mon Oct 30 14:44:29 2000
• Orig file: v2.4.0-test9/linux/drivers/scsi/sr.c
• Orig date: Sun Oct 8 10:50:25 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/scsi/sr.c linux/drivers/scsi/sr.c
@@ -473,9 +473,19 @@
 	Scsi_Request *SRpnt;
 
 	buffer = (unsigned char *) scsi_malloc(512);
-
-
 	SRpnt = scsi_allocate_request(scsi_CDs[i].device);
+	
+	if(buffer == NULL || SRpnt == NULL)
+	{
+		scsi_CDs[i].capacity = 0x1fffff;
+		sector_size = 2048;	/* A guess, just in case */
+		scsi_CDs[i].needs_sector_size = 1;
+		if(buffer)
+			scsi_free(buffer, 512);
+		if(SRpnt)
+			scsi_release_request(SRpnt);
+		return;
+	}	
 
 	retries = 3;
 	do {