]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
libata: relocate sdev->manage_start_stop configuration
authorTejun Heo <htejun@gmail.com>
Mon, 14 Jan 2008 23:46:59 +0000 (08:46 +0900)
committerJeff Garzik <jeff@garzik.org>
Tue, 15 Jan 2008 02:11:02 +0000 (21:11 -0500)
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>
drivers/ata/libata-scsi.c

index 264ae60e3fd8ae1a7e5ccb583545b1f6e6eac958..14daf4848f09add8d0e7e90659251fd25afcc649 100644 (file)
@@ -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);