Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / scsi / arm / ecoscsi.c

diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c
index 57e7961..6adcccb 100644 (file)
--- a/drivers/scsi/arm/ecoscsi.c
+++ b/drivers/scsi/arm/ecoscsi.c
@@ -155,16 +155,14 @@ printk("reading %p len %d\n",addr, len);
 
 #include "../NCR5380.c"
 
-static Scsi_Host_Template ecoscsi_template =  {
+static struct scsi_host_template ecoscsi_template =  {
        .module         = THIS_MODULE,
        .name           = "Serial Port EcoSCSI NCR5380",
        .proc_name      = "ecoscsi",
        .info           = ecoscsi_info,
        .queuecommand   = ecoscsi_queue_command,
        .eh_abort_handler       = NCR5380_abort,
-       .eh_device_reset_handler= NCR5380_device_reset,
        .eh_bus_reset_handler   = NCR5380_bus_reset,
-       .eh_host_reset_handler  = NCR5380_host_reset,
        .can_queue      = 16,
        .this_id        = 7,
        .sg_tablesize   = SG_ALL,
@@ -222,6 +220,7 @@ static void __exit ecoscsi_exit(void)
 
        if (shpnt->irq != IRQ_NONE)
                free_irq(shpnt->irq, NULL);
+       NCR5380_exit(host);
        if (shpnt->io_port)
                release_region(shpnt->io_port, shpnt->n_io_port);