[SCSI] sgiwd93: small fixes

[linux-2.6-omap-h63xx.git] / drivers / scsi / sgiwd93.c

diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 270f2aa88faad44cefae73d0b959d512e4729a7b..09fd203e4b86d480ee1fda1f15986f16be5ca10e 100644 (file)
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -33,7 +33,6 @@
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include "wd33c93.h"
-#include "sgiwd93.h"
 
 #include <linux/stat.h>
 
@@ -310,7 +309,14 @@ int sgiwd93_release(struct Scsi_Host *instance)
 static int sgiwd93_bus_reset(Scsi_Cmnd *cmd)
 {
        /* FIXME perform bus-specific reset */
+
+       /* FIXME 2: kill this function, and let midlayer fallback
+          to the same result, calling wd33c93_host_reset() */
+
+       spin_lock_irq(cmd->device->host->host_lock);
        wd33c93_host_reset(cmd);
+       spin_unlock_irq(cmd->device->host->host_lock);
+
        return SUCCESS;
 }
 
@@ -328,10 +334,10 @@ static Scsi_Host_Template driver_template = {
        .eh_abort_handler       = wd33c93_abort,
        .eh_bus_reset_handler   = sgiwd93_bus_reset,
        .eh_host_reset_handler  = wd33c93_host_reset,
-       .can_queue              = CAN_QUEUE,
+       .can_queue              = 16,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,
-       .cmd_per_lun            = CMD_PER_LUN,
+       .cmd_per_lun            = 8,
        .use_clustering         = DISABLE_CLUSTERING,
 };
 #include "scsi_module.c"