Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42427
b: refs/heads/master
c: 08157cd
h: refs/heads/master
i:
  42425: 95d7886
  42423: 202e98c
v: v3
  • Loading branch information
Jeff Garzik authored and James Bottomley committed Nov 15, 2006
1 parent 7c1784d commit 7ebb093
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 42252854011b31fe63ffeca44ac941e6fe8277ae
refs/heads/master: 08157cd0787004e2ebf9ee8cc92257244da53848
10 changes: 8 additions & 2 deletions trunk/drivers/scsi/aha1740.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7ebb093

Please sign in to comment.