libata: cable detection fixes

[linux-2.6-block.git] / drivers / ata / sata_inic162x.c

diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 1e21688bfcf2f4992fd493de5299e5beb679b7c7..11c3079ab6cc20ed8ff0c4b85493147bdc764923 100644 (file)
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -492,7 +492,7 @@ static void inic_post_internal_cmd(struct ata_queued_cmd *qc)
                inic_reset_port(inic_port_base(qc->ap));
 }
 
-static void inic_dev_config(struct ata_port *ap, struct ata_device *dev)
+static void inic_dev_config(struct ata_device *dev)
 {
        /* inic can only handle upto LBA28 max sectors */
        if (dev->max_sectors > ATA_MAX_SECTORS)
@@ -642,7 +642,9 @@ static int inic_pci_device_resume(struct pci_dev *pdev)
        void __iomem *mmio_base = host->iomap[MMIO_BAR];
        int rc;
 
-       ata_pci_device_do_resume(pdev);
+       rc = ata_pci_device_do_resume(pdev);
+       if (rc)
+               return rc;
 
        if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
                rc = init_controller(mmio_base, hpriv->cached_hctl);