1 files changed, 23 insertions, 1 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index d14a48e75f1b..c428a56e6f31 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -34,6 +34,13 @@ struct taskfile_array {
         u8      tfa[REGS_PER_GTF];      /* regs. 0x1f1 - 0x1f7 */
 };
 
+/*
+ *      Helper - belongs in the PCI layer somewhere eventually
+ */
+static int is_pci_dev(struct device *dev)
+{
+        return (dev->bus == &pci_bus_type);
+}
 
 /**
  * sata_get_dev_handle - finds acpi_handle and PCI device.function
@@ -53,6 +60,9 @@ static int sata_get_dev_handle(struct device *dev, acpi_handle *handle,
         struct pci_dev  *pci_dev;
         acpi_integer    addr;
 
+        if (!is_pci_dev(dev))
+                return -ENODEV;
+
         pci_dev = to_pci_dev(dev);      /* NOTE: PCI-specific */
         /* Please refer to the ACPI spec for the syntax of _ADR. */
         addr = (PCI_SLOT(pci_dev->devfn) << 16) | PCI_FUNC(pci_dev->devfn);
@@ -84,7 +94,12 @@ static int pata_get_dev_handle(struct device *dev, acpi_handle *handle,
         acpi_status status;
         struct acpi_device_info *dinfo = NULL;
         int ret = -ENODEV;
-        struct pci_dev *pdev = to_pci_dev(dev);
+        struct pci_dev *pdev;
+
+        if (!is_pci_dev(dev))
+                return -ENODEV;
+
+        pdev = to_pci_dev(dev);
 
         bus = pdev->bus->number;
         devnum = PCI_SLOT(pdev->devfn);
@@ -561,6 +576,13 @@ int ata_acpi_exec_tfs(struct ata_port *ap)
 
         if (noacpi)
                 return 0;
+        /*
+         * TBD - implement PATA support.  For now,
+         * we should not run GTF on PATA devices since some
+         * PATA require execution of GTM/STM before GTF.
+         */
+        if (!(ap->cbl == ATA_CBL_SATA))
+                return 0;
 
         for (ix = 0; ix < ATA_MAX_DEVICES; ix++) {
                 if (!ata_dev_enabled(&ap->device[ix]))