diff options
| author |   Tejun Heo <htejun@gmail.com> | 2008-01-15 08:46:59 +0900 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2008-01-14 21:11:02 -0500 |
| commit | d8cf5389bd9d1f0ac9fea51796c274ba64b83d80 (patch) | |
| tree | b6f6c10b9d7ca625ad531bd5ca1778d354fb15d5 /drivers/ata | |
| parent | sata_sil24: freeze on non-dev errors reported via CERR (diff) | |
| download | linux-dev-d8cf5389bd9d1f0ac9fea51796c274ba64b83d80.tar.xz linux-dev-d8cf5389bd9d1f0ac9fea51796c274ba64b83d80.zip | |
libata: relocate sdev->manage_start_stop configuration
After 9b8e8de7, manage_start_stop configuration depends on valid ATA
device. Move it into ata_scsi_dev_config(). This was detected by the
coverity checker.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 264ae60e3fd8..14daf4848f09 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -841,6 +841,9 @@ static void ata_scsi_dev_config(struct scsi_device *sdev, blk_queue_max_hw_segments(q, q->max_hw_segments - 1); } + if (dev->class == ATA_DEV_ATA) + sdev->manage_start_stop = 1; + if (dev->flags & ATA_DFLAG_AN) set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); @@ -872,9 +875,6 @@ int ata_scsi_slave_config(struct scsi_device *sdev) ata_scsi_sdev_config(sdev); - if (dev->class == ATA_DEV_ATA) - sdev->manage_start_stop = 1; - if (dev) ata_scsi_dev_config(sdev, dev); |