diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/scsi/qlogicfas408.c | |
| parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
| parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
| download | op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/qlogicfas408.c')
| -rw-r--r-- | drivers/scsi/qlogicfas408.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c index cb75e0b..52fb2ec 100644 --- a/drivers/scsi/qlogicfas408.c +++ b/drivers/scsi/qlogicfas408.c @@ -243,7 +243,7 @@ static void ql_icmd(Scsi_Cmnd * cmd) /**/ outb(qlcfg5, qbase + 5); /* select timer */ outb(qlcfg9 & 7, qbase + 9); /* prescaler */ /* outb(0x99, qbase + 5); */ - outb(cmd->device->id, qbase + 4); + outb(scmd_id(cmd), qbase + 4); for (i = 0; i < cmd->cmd_len; i++) outb(cmd->cmnd[i], qbase + 2); @@ -450,7 +450,7 @@ irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id, struct pt_regs *regs) int qlogicfas408_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) { struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd); - if (cmd->device->id == priv->qinitid) { + if (scmd_id(cmd) == priv->qinitid) { cmd->result = DID_BAD_TARGET << 16; done(cmd); return 0; |
