summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChuck Ebbert <76306.1226@compuserve.com>2006-01-12 05:58:40 +0100
committerJames Bottomley <jejb@mulgrave.(none)>2006-01-12 18:56:01 +0100
commitbcc1e382bce8de4f26182c6447916f9c82b0fbe5 (patch)
tree04f2230d3474ef68c07879be95d8fbbbf9285750 /drivers
parent[SCSI] aacraid: README update (diff)
downloadlinux-bcc1e382bce8de4f26182c6447916f9c82b0fbe5.tar.xz
linux-bcc1e382bce8de4f26182c6447916f9c82b0fbe5.zip
[SCSI] 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 <76306.1226@compuserve.com> Acked-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/sr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index ec73223ad2ea..18a3b756c63c 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -763,8 +763,9 @@ static void get_capabilities(struct scsi_cd *cd)
/* 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;