Commit 82ae989b authored by Andrew Morton's avatar Andrew Morton Committed by Christoph Hellwig

[PATCH] qlogic fix

Linus's current BK tree needs the following build fix:
parent c98a2447
...@@ -348,7 +348,7 @@ static void ql_icmd(Scsi_Cmnd * cmd) ...@@ -348,7 +348,7 @@ static void ql_icmd(Scsi_Cmnd * cmd)
/**/ outb(qlcfg5, qbase + 5); /* select timer */ /**/ outb(qlcfg5, qbase + 5); /* select timer */
outb(qlcfg9 & 7, qbase + 9); /* prescaler */ outb(qlcfg9 & 7, qbase + 9); /* prescaler */
/* outb(0x99, qbase + 5); */ /* outb(0x99, qbase + 5); */
outb(cmd->target, qbase + 4); outb(cmd->device->id, qbase + 4);
for (i = 0; i < cmd->cmd_len; i++) for (i = 0; i < cmd->cmd_len; i++)
outb(cmd->cmnd[i], qbase + 2); outb(cmd->cmnd[i], qbase + 2);
...@@ -573,7 +573,7 @@ static int qlogicfas_command(Scsi_Cmnd * cmd) ...@@ -573,7 +573,7 @@ static int qlogicfas_command(Scsi_Cmnd * cmd)
* Non-irq version * Non-irq version
*/ */
if (cmd->target == qinitid) if (cmd->device->id == qinitid)
return (DID_BAD_TARGET << 16); return (DID_BAD_TARGET << 16);
ql_icmd(cmd); ql_icmd(cmd);
if ((k = ql_wai())) if ((k = ql_wai()))
...@@ -590,7 +590,7 @@ static int qlogicfas_command(Scsi_Cmnd * cmd) ...@@ -590,7 +590,7 @@ static int qlogicfas_command(Scsi_Cmnd * cmd)
int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
{ {
if (cmd->target == qinitid) { if (cmd->device->id == qinitid) {
cmd->result = DID_BAD_TARGET << 16; cmd->result = DID_BAD_TARGET << 16;
done(cmd); done(cmd);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment