Revert "EISA: Initialize device before its resources"

This reverts commit 26abfeed4341872364386c6a52b9acef8c81a81a.

In the eisa_probe() force_probe path, if we were unable to request slot
resources (e.g., [io 0x800-0x8ff]), we skipped the slot with "Cannot
allocate resource for EISA slot %d" before reading the EISA signature in
eisa_init_device().

Commit 26abfeed4341 moved eisa_init_device() earlier, so we tried to read
the EISA signature before requesting the slot resources, and this caused
hangs during boot.

Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1251816
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org	# v3.10+ a2080d0c561c: Revert "EISA: Log device resources in dmesg"

1 files changed, 15 insertions, 11 deletions

diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index 1b86fe0c2e80..612afeaec3cb 100644
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -277,11 +277,13 @@ static int __init eisa_request_resources(struct eisa_root_device *root,
                 }
                 
                 if (slot) {
+                        edev->res[i].name  = NULL;
                         edev->res[i].start = SLOT_ADDRESS(root, slot)
                                              + (i * 0x400);
                         edev->res[i].end   = edev->res[i].start + 0xff;
                         edev->res[i].flags = IORESOURCE_IO;
                 } else {
+                        edev->res[i].name  = NULL;
                         edev->res[i].start = SLOT_ADDRESS(root, slot)
                                              + EISA_VENDOR_ID_OFFSET;
                         edev->res[i].end   = edev->res[i].start + 3;
@@ -327,19 +329,20 @@ static int __init eisa_probe(struct eisa_root_device *root)
                 return -ENOMEM;
         }
                 
-        if (eisa_init_device(root, edev, 0)) {
+        if (eisa_request_resources(root, edev, 0)) {
+                dev_warn(root->dev,
+                         "EISA: Cannot allocate resource for mainboard\n");
                 kfree(edev);
                 if (!root->force_probe)
-                        return -ENODEV;
+                        return -EBUSY;
                 goto force_probe;
         }
 
-        if (eisa_request_resources(root, edev, 0)) {
-                dev_warn(root->dev,
-                         "EISA: Cannot allocate resource for mainboard\n");
+        if (eisa_init_device(root, edev, 0)) {
+                eisa_release_resources(edev);
                 kfree(edev);
                 if (!root->force_probe)
-                        return -EBUSY;
+                        return -ENODEV;
                 goto force_probe;
         }
 
@@ -362,11 +365,6 @@ static int __init eisa_probe(struct eisa_root_device *root)
                         continue;
                 }
 
-                if (eisa_init_device(root, edev, i)) {
-                        kfree(edev);
-                        continue;
-                }
-
                 if (eisa_request_resources(root, edev, i)) {
                         dev_warn(root->dev,
                                  "Cannot allocate resource for EISA slot %d\n",
@@ -375,6 +373,12 @@ static int __init eisa_probe(struct eisa_root_device *root)
                         continue;
                 }
 
+                if (eisa_init_device(root, edev, i)) {
+                        eisa_release_resources(edev);
+                        kfree(edev);
+                        continue;
+                }
+
                 if (edev->state == (EISA_CONFIG_ENABLED | EISA_CONFIG_FORCED))
                         enabled_str = " (forced enabled)";
                 else if (edev->state == EISA_CONFIG_FORCED)