Merge ../scsi-misc-2.6

Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index bd337a914298..bfb4f49e125d 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -2866,8 +2866,7 @@ static int nsp32_detect(struct scsi_host_template *sht)
          */
         nsp32_do_bus_reset(data);
 
-        ret = request_irq(host->irq, do_nsp32_isr,
-                          IRQF_SHARED | IRQF_SAMPLE_RANDOM, "nsp32", data);
+        ret = request_irq(host->irq, do_nsp32_isr, IRQF_SHARED, "nsp32", data);
         if (ret < 0) {
                 nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
                           "SCSI PCI controller. Interrupt: %d", host->irq);
@@ -2886,12 +2885,19 @@ static int nsp32_detect(struct scsi_host_template *sht)
         }
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
-        scsi_add_host (host, &PCIDEV->dev);
+        ret = scsi_add_host(host, &PCIDEV->dev);
+        if (ret) {
+                nsp32_msg(KERN_ERR, "failed to add scsi host");
+                goto free_region;
+        }
         scsi_scan_host(host);
 #endif
         pci_set_drvdata(PCIDEV, host);
         return DETECT_OK;
 
+ free_region:
+        release_region(host->io_port, host->n_io_port);
+
  free_irq:
         free_irq(host->irq, data);