git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
/
a3000.c
diff --git
a/drivers/scsi/a3000.c
b/drivers/scsi/a3000.c
index
f8a89ec
..
f425d42
100644
(file)
--- a/
drivers/scsi/a3000.c
+++ b/
drivers/scsi/a3000.c
@@
-168,7
+168,7
@@
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
}
}
}
}
-int __init a3000_detect(
Scsi_Host_T
emplate *tpnt)
+int __init a3000_detect(
struct scsi_host_t
emplate *tpnt)
{
wd33c93_regs regs;
{
wd33c93_regs regs;
@@
-208,13
+208,20
@@
fail_register:
static int a3000_bus_reset(Scsi_Cmnd *cmd)
{
/* FIXME perform bus-specific reset */
static int a3000_bus_reset(Scsi_Cmnd *cmd)
{
/* FIXME perform bus-specific reset */
+
+ /* FIXME 2: kill this entire function, which should
+ cause mid-layer to call wd33c93_host_reset anyway? */
+
+ spin_lock_irq(cmd->device->host->host_lock);
wd33c93_host_reset(cmd);
wd33c93_host_reset(cmd);
+ spin_unlock_irq(cmd->device->host->host_lock);
+
return SUCCESS;
}
#define HOSTS_C
return SUCCESS;
}
#define HOSTS_C
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "A3000",
.name = "Amiga 3000 built-in SCSI",
.detect = a3000_detect,
.proc_name = "A3000",
.name = "Amiga 3000 built-in SCSI",
.detect = a3000_detect,