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
/
gvp11.c
diff --git
a/drivers/scsi/gvp11.c
b/drivers/scsi/gvp11.c
index
30cbf73
..
5b15449
100644
(file)
--- a/
drivers/scsi/gvp11.c
+++ b/
drivers/scsi/gvp11.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/init.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/interrupt.h>
@@
-170,7
+169,7
@@
static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
#define CHECK_WD33C93
#define CHECK_WD33C93
-int __init gvp11_detect(
Scsi_Host_T
emplate *tpnt)
+int __init gvp11_detect(
struct scsi_host_t
emplate *tpnt)
{
static unsigned char called = 0;
struct Scsi_Host *instance;
{
static unsigned char called = 0;
struct Scsi_Host *instance;
@@
-345,7
+344,15
@@
release:
static int gvp11_bus_reset(Scsi_Cmnd *cmd)
{
/* FIXME perform bus-specific reset */
static int gvp11_bus_reset(Scsi_Cmnd *cmd)
{
/* FIXME perform bus-specific reset */
+
+ /* FIXME 2: shouldn't we no-op this function (return
+ FAILED), and fall back to host reset function,
+ 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;
}
@@
-354,7
+361,7
@@
static int gvp11_bus_reset(Scsi_Cmnd *cmd)
#include "gvp11.h"
#include "gvp11.h"
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "GVP11",
.name = "GVP Series II SCSI",
.detect = gvp11_detect,
.proc_name = "GVP11",
.name = "GVP Series II SCSI",
.detect = gvp11_detect,