2 files changed, 17 insertions, 2 deletions

diff --git a/drivers/scsi/libata-bmdma.c b/drivers/scsi/libata-bmdma.c
index 4bc05371737c..13fab97c840e 100644
--- a/drivers/scsi/libata-bmdma.c
+++ b/drivers/scsi/libata-bmdma.c
@@ -1076,10 +1076,21 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
 
         /* FIXME: check ata_device_add return */
         if (legacy_mode) {
-                if (legacy_mode & (1 << 0))
+                struct device *dev = &pdev->dev;
+                struct ata_host_set *host_set = NULL;
+
+                if (legacy_mode & (1 << 0)) {
                         ata_device_add(probe_ent);
-                if (legacy_mode & (1 << 1))
+                        host_set = dev_get_drvdata(dev);
+                }
+
+                if (legacy_mode & (1 << 1)) {
                         ata_device_add(probe_ent2);
+                        if (host_set) {
+                                host_set->next = dev_get_drvdata(dev);
+                                dev_set_drvdata(dev, host_set);
+                        }
+                }
         } else
                 ata_device_add(probe_ent);
 
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 014855e5a43a..d73cb3672d6a 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -5621,8 +5621,12 @@ void ata_pci_remove_one (struct pci_dev *pdev)
 {
         struct device *dev = pci_dev_to_dev(pdev);
         struct ata_host_set *host_set = dev_get_drvdata(dev);
+        struct ata_host_set *host_set2 = host_set->next;
 
         ata_host_set_remove(host_set);
+        if (host_set2)
+                ata_host_set_remove(host_set2);
+
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         dev_set_drvdata(dev, NULL);