diff options
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r-- | drivers/ata/libata-scsi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 97a0cef12959..db6dfcfa3e2e 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -3679,7 +3679,6 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync) | |||
3679 | if (!IS_ERR(sdev)) { | 3679 | if (!IS_ERR(sdev)) { |
3680 | dev->sdev = sdev; | 3680 | dev->sdev = sdev; |
3681 | scsi_device_put(sdev); | 3681 | scsi_device_put(sdev); |
3682 | ata_scsi_acpi_bind(dev); | ||
3683 | } else { | 3682 | } else { |
3684 | dev->sdev = NULL; | 3683 | dev->sdev = NULL; |
3685 | } | 3684 | } |
@@ -3767,8 +3766,6 @@ static void ata_scsi_remove_dev(struct ata_device *dev) | |||
3767 | struct scsi_device *sdev; | 3766 | struct scsi_device *sdev; |
3768 | unsigned long flags; | 3767 | unsigned long flags; |
3769 | 3768 | ||
3770 | ata_scsi_acpi_unbind(dev); | ||
3771 | |||
3772 | /* Alas, we need to grab scan_mutex to ensure SCSI device | 3769 | /* Alas, we need to grab scan_mutex to ensure SCSI device |
3773 | * state doesn't change underneath us and thus | 3770 | * state doesn't change underneath us and thus |
3774 | * scsi_device_get() always succeeds. The mutex locking can | 3771 | * scsi_device_get() always succeeds. The mutex locking can |