Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 5 insertions, 18 deletions

diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index ebfddd40ce67..ef19adc67eff 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -785,26 +785,14 @@ int sym53c416_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
         return 0;
 }
 
-static int sym53c416_abort(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
-static int sym53c416_bus_reset(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
-static int sym53c416_device_reset(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
 static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
 {
         int base;
         int scsi_id = -1;       
         int i;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sym53c416_lock, flags);
 
         /* printk("sym53c416_reset\n"); */
         base = SCpnt->device->host->io_port;
@@ -816,6 +804,8 @@ static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
         outb(NOOP | PIO_MODE, base + COMMAND_REG);
         outb(RESET_SCSI_BUS, base + COMMAND_REG);
         sym53c416_init(base, scsi_id);
+
+        spin_unlock_irqrestore(&sym53c416_lock, flags);
         return SUCCESS;
 }
 
@@ -865,10 +855,7 @@ static Scsi_Host_Template driver_template = {
         .detect =               sym53c416_detect,
         .info =                 sym53c416_info, 
         .queuecommand =         sym53c416_queuecommand,
-        .eh_abort_handler =     sym53c416_abort,
         .eh_host_reset_handler =sym53c416_host_reset,
-        .eh_bus_reset_handler = sym53c416_bus_reset,
-        .eh_device_reset_handler =sym53c416_device_reset,
         .release =              sym53c416_release,
         .bios_param =           sym53c416_bios_param,
         .can_queue =            1,