Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index c3c38a7e8d32..d7af9c63a04d 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -586,7 +586,7 @@ static struct scsi_host_template aha1740_template = {
 
 static int aha1740_probe (struct device *dev)
 {
-        int slotbase;
+        int slotbase, rc;
         unsigned int irq_level, irq_type, translation;
         struct Scsi_Host *shpnt;
         struct aha1740_hostdata *host;
@@ -641,10 +641,16 @@ static int aha1740_probe (struct device *dev)
         }
 
         eisa_set_drvdata (edev, shpnt);
-        scsi_add_host (shpnt, dev); /* XXX handle failure */
+
+        rc = scsi_add_host (shpnt, dev);
+        if (rc)
+                goto err_irq;
+
         scsi_scan_host (shpnt);
         return 0;
 
+ err_irq:
+        free_irq(irq_level, shpnt);
  err_unmap:
         dma_unmap_single (&edev->dev, host->ecb_dma_addr,
                           sizeof (host->ecb), DMA_BIDIRECTIONAL);