1 files changed, 6 insertions, 2 deletions

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);
     }