Commit 62b1ea27 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[PATCH] fix an aha1740 merge error

it should use scsi_host_alloc/scsi_host_put now.
parent 70426f72
...@@ -606,7 +606,7 @@ static int aha1740_probe (struct device *dev) ...@@ -606,7 +606,7 @@ static int aha1740_probe (struct device *dev)
dev->name, slotbase, irq_level); dev->name, slotbase, irq_level);
printk(KERN_INFO "aha174x: Extended translation %sabled.\n", printk(KERN_INFO "aha174x: Extended translation %sabled.\n",
translation ? "en" : "dis"); translation ? "en" : "dis");
shpnt = scsi_register(&aha1740_template, shpnt = scsi_host_alloc(&aha1740_template,
sizeof(struct aha1740_hostdata)); sizeof(struct aha1740_hostdata));
if(shpnt == NULL) if(shpnt == NULL)
goto err_release; goto err_release;
...@@ -658,7 +658,7 @@ static __devexit int aha1740_remove (struct device *dev) ...@@ -658,7 +658,7 @@ static __devexit int aha1740_remove (struct device *dev)
sizeof (host->ecb), DMA_BIDIRECTIONAL); sizeof (host->ecb), DMA_BIDIRECTIONAL);
release_region (shpnt->io_port, SLOTSIZE); release_region (shpnt->io_port, SLOTSIZE);
scsi_unregister (shpnt); scsi_host_put (shpnt);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment