patch-2.3.34 linux/drivers/scsi/sr.c

• Lines: 35
• Date: Sat Dec 18 15:36:40 1999
• Orig file: v2.3.33/linux/drivers/scsi/sr.c
• Orig date: Tue Dec 14 01:27:24 1999

diff -u --recursive --new-file v2.3.33/linux/drivers/scsi/sr.c linux/drivers/scsi/sr.c
@@ -486,7 +486,7 @@
 	buffer = (unsigned char *) scsi_malloc(512);
 
 
-	SCpnt = scsi_allocate_device(scsi_CDs[i].device, 1);
+	SCpnt = scsi_allocate_device(scsi_CDs[i].device, 1, FALSE);
 
 	retries = 3;
 	do {
@@ -509,7 +509,6 @@
 	} while (the_result && retries);
 
 
-	wake_up(&SCpnt->device->device_wait);
 	scsi_release_command(SCpnt);
 	SCpnt = NULL;
 
@@ -659,7 +658,7 @@
 	int buflen;
 
 	/* get the device */
-	SCpnt = scsi_allocate_device(device, 1);
+	SCpnt = scsi_allocate_device(device, 1, FALSE);
 	if (SCpnt == NULL)
 		return -ENODEV;	/* this just doesn't seem right /axboe */
 
@@ -864,7 +863,7 @@
 		sr_hardsizes = NULL;
 	}
 	blksize_size[MAJOR_NR] = NULL;
-        hardsect_size[MAJOR_NR] = sr_hardsizes;
+        hardsect_size[MAJOR_NR] = NULL;
 	blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 	blk_size[MAJOR_NR] = NULL;
 	read_ahead[MAJOR_NR] = 0;