Merge tag 'for-linus-20140225' of git://git.infradead.org/linux-mtd

[~andy/linux] / drivers / ata / sata_sil24.c

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 59f0d630d634c7ff0c993f4780dbc7b55e682aff..aa1051ba6d1334885c9ac5272164e50a364dd6d8 100644 (file)
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1353,7 +1353,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #ifdef CONFIG_PM
 static int sil24_pci_device_resume(struct pci_dev *pdev)
 {
-       struct ata_host *host = dev_get_drvdata(&pdev->dev);
+       struct ata_host *host = pci_get_drvdata(pdev);
        void __iomem *host_base = host->iomap[SIL24_HOST_BAR];
        int rc;