Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / drivers / scsi / mac_esp.c

diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index bb567d3b069399c642b041069663e922cea3ba64..cdb61eaa2d1f824f8d2082b0a0cb3942c9cab7f0 100644 (file)
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -55,6 +55,7 @@ struct mac_esp_priv {
        int error;
 };
 static struct esp *esp_chips[2];
+static DEFINE_SPINLOCK(esp_chips_lock);
 
 #define MAC_ESP_GET_PRIV(esp) ((struct mac_esp_priv *) \
                               platform_get_drvdata((struct platform_device *) \
@@ -562,15 +563,18 @@ static int esp_mac_probe(struct platform_device *dev)
        }
 
        host->irq = IRQ_MAC_SCSI;
-       esp_chips[dev->id] = esp;
-       mb();
-       if (esp_chips[!dev->id] == NULL) {
-               err = request_irq(host->irq, mac_scsi_esp_intr, 0, "ESP", NULL);
-               if (err < 0) {
-                       esp_chips[dev->id] = NULL;
-                       goto fail_free_priv;
-               }
+
+       /* The request_irq() call is intended to succeed for the first device
+        * and fail for the second device.
+        */
+       err = request_irq(host->irq, mac_scsi_esp_intr, 0, "ESP", NULL);
+       spin_lock(&esp_chips_lock);
+       if (err < 0 && esp_chips[!dev->id] == NULL) {
+               spin_unlock(&esp_chips_lock);
+               goto fail_free_priv;
        }
+       esp_chips[dev->id] = esp;
+       spin_unlock(&esp_chips_lock);
 
        err = scsi_esp_register(esp, &dev->dev);
        if (err)
@@ -579,8 +583,13 @@ static int esp_mac_probe(struct platform_device *dev)
        return 0;
 
 fail_free_irq:
-       if (esp_chips[!dev->id] == NULL)
-               free_irq(host->irq, esp);
+       spin_lock(&esp_chips_lock);
+       esp_chips[dev->id] = NULL;
+       if (esp_chips[!dev->id] == NULL) {
+               spin_unlock(&esp_chips_lock);
+               free_irq(host->irq, NULL);
+       } else
+               spin_unlock(&esp_chips_lock);
 fail_free_priv:
        kfree(mep);
 fail_free_command_block:
@@ -599,9 +608,13 @@ static int esp_mac_remove(struct platform_device *dev)
 
        scsi_esp_unregister(esp);
 
+       spin_lock(&esp_chips_lock);
        esp_chips[dev->id] = NULL;
-       if (!(esp_chips[0] || esp_chips[1]))
+       if (esp_chips[!dev->id] == NULL) {
+               spin_unlock(&esp_chips_lock);
                free_irq(irq, NULL);
+       } else
+               spin_unlock(&esp_chips_lock);
 
        kfree(mep);