Skip to contentSkip to conversation

Mask capabilities for SCSI-1 CD drive

PATCH In review Chuck Ebbert 2 participants 2 messages Jan 12, 2006 SCSI

lore
Share & tools
lore

Chuck Ebbert

author
#0 lore raw

PATCH 1/1 Mask capabilities for SCSI-1 CD drive

SCSI-1 CD drives can't do MRW or be opened for writing, so mask off those capabilities.

Signed-off-by Chuck Ebbert <[email protected]>
drivers/scsi/sr.c +3 -2
@@ -762,8 +762,9 @@ static void get_capabilities(struct scsi
 		/* failed, drive doesn't have capabilities mode page */
 		cd->cdi.speed = 1;
 		cd->cdi.mask |= (CDC_CD_R | CDC_CD_RW | CDC_DVD_R |
-					 CDC_DVD | CDC_DVD_RAM |
-					 CDC_SELECT_DISC | CDC_SELECT_SPEED);
+				 CDC_DVD | CDC_DVD_RAM |
+				 CDC_SELECT_DISC | CDC_SELECT_SPEED |
+				 CDC_MRW | CDC_MRW_W | CDC_RAM);
 		kfree(buffer);
 		printk("%s: scsi-1 drive\n", cd->cdi.name);
 		return;
Signature · 2 lines
Chuck
Currently reading: _Olympos_ by Dan Simmons
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Chuck Ebbert

SCSI-1 CD drives can't do MRW or be opened for writing, so mask off those capabilities.

Signed-off-by Chuck Ebbert <[email protected]>
drivers/scsi/sr.c +0 -0
@@ -762,8 +762,9 @@ static void get_capabilities(struct scsi
 		/* failed, drive doesn't have capabilities mode page */

drivers/scsi/sr.c static void get_capabilities(struct scsi · line 770

Quoted 10 lines
drivers/scsi/sr.c +3 -2
 		cd->cdi.speed = 1;
 		cd->cdi.mask |= (CDC_CD_R | CDC_CD_RW | CDC_DVD_R |
-					 CDC_DVD | CDC_DVD_RAM |
-					 CDC_SELECT_DISC | CDC_SELECT_SPEED);
+				 CDC_DVD | CDC_DVD_RAM |
+				 CDC_SELECT_DISC | CDC_SELECT_SPEED |
+				 CDC_MRW | CDC_MRW_W | CDC_RAM);
 		kfree(buffer);
 		printk("%s: scsi-1 drive\n", cd->cdi.name);
 		return;

Looks fine, thanks.

Acked-by Jens Axboe <[email protected]>
Signature · 1 line
Jens Axboe