From: Chuck Ebbert <76306.1226@compuserve.com> Date: Thu, 12 Jan 2006 04:58:40 +0000 (-0500) Subject: [SCSI] Mask capabilities for SCSI-1 CD drive X-Git-Tag: v2.6.16-rc1~162^2~52 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcc1e382bce8de4f26182c6447916f9c82b0fbe5;p=linux-2.6 [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 Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index ec73223ad2..18a3b756c6 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;