diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-24 10:07:21 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-24 10:07:21 +1100 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /drivers/ata/libata-scsi.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
| download | kernel-crypto-9156ad48338e0306e508ead5c0d9986050744475.tar.gz kernel-crypto-9156ad48338e0306e508ead5c0d9986050744475.tar.xz kernel-crypto-9156ad48338e0306e508ead5c0d9986050744475.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ata/libata-scsi.c')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index a883bb03d4c..14daf4848f0 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,8 +875,6 @@ int ata_scsi_slave_config(struct scsi_device *sdev) ata_scsi_sdev_config(sdev); - sdev->manage_start_stop = 1; - if (dev) ata_scsi_dev_config(sdev, dev); |