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
/
mvme147.c
diff --git
a/drivers/scsi/mvme147.c
b/drivers/scsi/mvme147.c
index
e73b33f
..
cb367c2
100644
(file)
--- a/
drivers/scsi/mvme147.c
+++ b/
drivers/scsi/mvme147.c
@@
-2,7
+2,6
@@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
-#include <linux/version.h>
#include <linux/interrupt.h>
#include <asm/page.h>
#include <linux/interrupt.h>
#include <asm/page.h>
@@
-64,7
+63,7
@@
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
m147_pcc->dma_cntrl = 0;
}
m147_pcc->dma_cntrl = 0;
}
-int mvme147_detect(
Scsi_Host_T
emplate *tpnt)
+int mvme147_detect(
struct scsi_host_t
emplate *tpnt)
{
static unsigned char called = 0;
wd33c93_regs regs;
{
static unsigned char called = 0;
wd33c93_regs regs;
@@
-116,7
+115,14
@@
int mvme147_detect(Scsi_Host_Template *tpnt)
static int mvme147_bus_reset(Scsi_Cmnd *cmd)
{
/* FIXME perform bus-specific reset */
static int mvme147_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);
wd33c93_host_reset(cmd);
+ spin_unlock_irq(cmd->device->host->host_lock);
+
return SUCCESS;
}
return SUCCESS;
}
@@
-124,7
+130,7
@@
static int mvme147_bus_reset(Scsi_Cmnd *cmd)
#include "mvme147.h"
#include "mvme147.h"
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "MVME147",
.name = "MVME147 built-in SCSI",
.detect = mvme147_detect,
.proc_name = "MVME147",
.name = "MVME147 built-in SCSI",
.detect = mvme147_detect,