Commit d8cf5389 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik

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: default avatarTejun Heo <htejun@gmail.com>
Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c2e14f11
...@@ -841,6 +841,9 @@ static void ata_scsi_dev_config(struct scsi_device *sdev, ...@@ -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); 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) if (dev->flags & ATA_DFLAG_AN)
set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);
...@@ -872,9 +875,6 @@ int ata_scsi_slave_config(struct scsi_device *sdev) ...@@ -872,9 +875,6 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
ata_scsi_sdev_config(sdev); ata_scsi_sdev_config(sdev);
if (dev->class == ATA_DEV_ATA)
sdev->manage_start_stop = 1;
if (dev) if (dev)
ata_scsi_dev_config(sdev, dev); ata_scsi_dev_config(sdev, dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment