This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / sr.c

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index dc9d740..3fedadc 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -377,7 +377,6 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
                        return 0;
                SCpnt->cmnd[0] = WRITE_10;
                SCpnt->sc_data_direction = DMA_TO_DEVICE;
-               cd->cdi.media_written = 1;
        } else if (rq_data_dir(SCpnt->request) == READ) {
                SCpnt->cmnd[0] = READ_10;
                SCpnt->sc_data_direction = DMA_FROM_DEVICE;
@@ -876,10 +875,10 @@ static void get_capabilities(struct scsi_cd *cd)
                cd->cdi.mask |= CDC_CLOSE_TRAY; */
 
        /*
-        * if DVD-RAM, MRW-W or CD-RW, we are randomly writable
+        * if DVD-RAM of MRW-W, we are randomly writeable
         */
-       if ((cd->cdi.mask & (CDC_DVD_RAM | CDC_MRW_W | CDC_RAM | CDC_CD_RW)) !=
-                       (CDC_DVD_RAM | CDC_MRW_W | CDC_RAM | CDC_CD_RW)) {
+       if ((cd->cdi.mask & (CDC_DVD_RAM | CDC_MRW_W | CDC_RAM)) !=
+                       (CDC_DVD_RAM | CDC_MRW_W | CDC_RAM)) {
                cd->device->writeable = 1;
        }