libata: kill ATA_FLAG_DISABLED

[safe/jmp/linux-2.6] / drivers / scsi / ipr.c

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 520461b..b90c118 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4295,7 +4295,7 @@ static void ipr_slave_destroy(struct scsi_device *sdev)
        res = (struct ipr_resource_entry *) sdev->hostdata;
        if (res) {
                if (res->sata_port)
-                       ata_port_disable(res->sata_port->ap);
+                       res->sata_port->ap->link.device[0].class = ATA_DEV_NONE;
                sdev->hostdata = NULL;
                res->sdev = NULL;
                res->sata_port = NULL;
@@ -5751,13 +5751,13 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
        rc = ipr_device_reset(ioa_cfg, res);
 
        if (rc) {
-               ata_port_disable(ap);
+               ap->link.device[0].class = ATA_DEV_NONE;
                goto out_unlock;
        }
 
        ap->link.device[0].class = res->ata_class;
        if (ap->link.device[0].class == ATA_DEV_UNKNOWN)
-               ata_port_disable(ap);
+               ap->link.device[0].class = ATA_DEV_NONE;
 
 out_unlock:
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);