2 files changed, 18 insertions, 8 deletions

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 07d572feceed..37dd47136fb1 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -169,10 +169,8 @@ int __init a2091_detect(struct scsi_host_template *tpnt)
             continue;
 
         instance = scsi_register (tpnt, sizeof (struct WD33C93_hostdata));
-        if (instance == NULL) {
-            release_mem_region(address, 256);
-            continue;
-        }
+        if (instance == NULL)
+            goto release;
         instance->base = ZTWO_VADDR(address);
         instance->irq = IRQ_AMIGA_PORTS;
         instance->unique_id = z->slotaddr;
@@ -183,10 +181,18 @@ int __init a2091_detect(struct scsi_host_template *tpnt)
         HDATA(instance)->fast = 0;
         HDATA(instance)->dma_mode = CTRL_DMA;
         wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
-        request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED, "A2091 SCSI",
-                    instance);
+        if (request_irq(IRQ_AMIGA_PORTS, a2091_intr, IRQF_SHARED, "A2091 SCSI",
+                        instance))
+            goto unregister;
         DMA(instance)->CNTR = CNTR_PDMD | CNTR_INTEN;
         num_a2091++;
+        continue;
+
+unregister:
+        scsi_unregister(instance);
+        wd33c93_release();
+release:
+        release_mem_region(address, 256);
     }
 
     return num_a2091;
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index ca7363752401..5d1bf7e3d245 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -329,12 +329,16 @@ int __init gvp11_detect(struct scsi_host_template *tpnt)
                      (epc & GVP_SCSICLKMASK) ? WD33C93_FS_8_10
                                              : WD33C93_FS_12_15);
 
-        request_irq(IRQ_AMIGA_PORTS, gvp11_intr, IRQF_SHARED, "GVP11 SCSI",
-                    instance);
+        if (request_irq(IRQ_AMIGA_PORTS, gvp11_intr, IRQF_SHARED, "GVP11 SCSI",
+                        instance))
+                goto unregister;
         DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE;
         num_gvp11++;
         continue;
 
+unregister:
+        scsi_unregister(instance);
+        wd33c93_release();
 release:
         release_mem_region(address, 256);
     }