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
/
arm
/
fas216.c
diff --git
a/drivers/scsi/arm/fas216.c
b/drivers/scsi/arm/fas216.c
index
3838f88
..
3e1053f
100644
(file)
--- a/
drivers/scsi/arm/fas216.c
+++ b/
drivers/scsi/arm/fas216.c
@@
-173,7
+173,7
@@
static void fas216_dumpstate(FAS216_Info *info)
fas216_readb(info, REG_CTCH));
}
fas216_readb(info, REG_CTCH));
}
-static void print_SCp(
Scsi_P
ointer *SCp, const char *prefix, const char *suffix)
+static void print_SCp(
struct scsi_p
ointer *SCp, const char *prefix, const char *suffix)
{
printk("%sptr %p this_residual 0x%x buffer %p buffers_residual 0x%x%s",
prefix, SCp->ptr, SCp->this_residual, SCp->buffer,
{
printk("%sptr %p this_residual 0x%x buffer %p buffers_residual 0x%x%s",
prefix, SCp->ptr, SCp->this_residual, SCp->buffer,
@@
-628,7
+628,7
@@
static void fas216_handlesync(FAS216_Info *info, char *msg)
*/
static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
{
*/
static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
{
-
Scsi_P
ointer *SCp = &info->scsi.SCp;
+
struct scsi_p
ointer *SCp = &info->scsi.SCp;
fas216_checkmagic(info);
fas216_checkmagic(info);
@@
-668,7
+668,7
@@
static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
*/
static void fas216_pio(FAS216_Info *info, fasdmadir_t direction)
{
*/
static void fas216_pio(FAS216_Info *info, fasdmadir_t direction)
{
-
Scsi_P
ointer *SCp = &info->scsi.SCp;
+
struct scsi_p
ointer *SCp = &info->scsi.SCp;
fas216_checkmagic(info);
fas216_checkmagic(info);
@@
-2559,7
+2559,7
@@
int fas216_eh_bus_reset(Scsi_Cmnd *SCpnt)
{
FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
unsigned long flags;
{
FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
unsigned long flags;
-
Scsi_D
evice *SDpnt;
+
struct scsi_d
evice *SDpnt;
fas216_checkmagic(info);
fas216_log(info, LOG_ERROR, "resetting bus");
fas216_checkmagic(info);
fas216_log(info, LOG_ERROR, "resetting bus");
@@
-2659,6
+2659,8
@@
int fas216_eh_host_reset(Scsi_Cmnd *SCpnt)
{
FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
{
FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
+ spin_lock_irq(info->host->host_lock);
+
fas216_checkmagic(info);
printk("scsi%d.%c: %s: resetting host\n",
fas216_checkmagic(info);
printk("scsi%d.%c: %s: resetting host\n",
@@
-2686,6
+2688,7
@@
int fas216_eh_host_reset(Scsi_Cmnd *SCpnt)
fas216_init_chip(info);
fas216_init_chip(info);
+ spin_unlock_irq(info->host->host_lock);
return SUCCESS;
}
return SUCCESS;
}
@@
-2997,7
+3000,7
@@
int fas216_print_stats(FAS216_Info *info, char *buffer)
int fas216_print_devices(FAS216_Info *info, char *buffer)
{
struct fas216_device *dev;
int fas216_print_devices(FAS216_Info *info, char *buffer)
{
struct fas216_device *dev;
-
Scsi_D
evice *scd;
+
struct scsi_d
evice *scd;
char *p = buffer;
p += sprintf(p, "Device/Lun TaggedQ Parity Sync\n");
char *p = buffer;
p += sprintf(p, "Device/Lun TaggedQ Parity Sync\n");