diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-07-18 14:59:19 (GMT) |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-07-25 21:16:41 (GMT) |
| commit | fd2eb9034e48cdca358dc06a833a736e7c6f68dd (patch) | |
| tree | 18366ad7112141752ca2ab95ec7fd07a9a23f9a3 /drivers/scsi/sr.c | |
| parent | 7a14c1c3319608154da8712e4174d56ffb2f7b8d (diff) | |
| download | linux-fd2eb9034e48cdca358dc06a833a736e7c6f68dd.tar.xz | |
scsi: move the writeable field from struct scsi_device to struct scsi_cd
We currently set the field in common code based on the device type,
but then only use it in the cdrom driver which also overrides the
value previously set in the generic code.
Just leave this entirely to the CDROM driver to make everyones life
simpler.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index cce47712..7eeb936 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -435,7 +435,7 @@ static int sr_init_command(struct scsi_cmnd *SCpnt) } if (rq_data_dir(rq) == WRITE) { - if (!cd->device->writeable) + if (!cd->writeable) goto out; SCpnt->cmnd[0] = WRITE_10; cd->cdi.media_written = 1; @@ -927,7 +927,7 @@ static void get_capabilities(struct scsi_cd *cd) */ 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)) { - cd->device->writeable = 1; + cd->writeable = 1; } kfree(buffer); |