From 831adf1190dcf2ec275523e8126a2d909c7b612b Mon Sep 17 00:00:00 2001 From: Miquel van Smoorenburg Date: Wed, 5 Nov 2008 00:09:12 +0100 Subject: [PATCH] --- yaml --- r: 119007 b: refs/heads/master c: df81d2371aeca0f7474f197a3090830899016e39 h: refs/heads/master i: 119005: 5950048f2673b8624fc5b8ff38624fae30f40541 119003: 0b1a2cb031acc76765257fb057fe34f2fa0d56a7 118999: a5b8f1659fa7453e4853abdbfc4128010119cafd 118991: 9a435e2f9438fe654e98fda14a5c55e5a3f38428 118975: 9559b61e6cce5802c6ded1d9e9e0d0f8360dd8fd v: v3 --- [refs] | 2 +- trunk/drivers/scsi/dpt_i2o.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3a5589c2ec41..269fbd0a0d60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 939c2288c35132fe340b2694c7d02cacf7593723 +refs/heads/master: df81d2371aeca0f7474f197a3090830899016e39 diff --git a/trunk/drivers/scsi/dpt_i2o.c b/trunk/drivers/scsi/dpt_i2o.c index 8aba4fdfb522..6194ed5d02c4 100644 --- a/trunk/drivers/scsi/dpt_i2o.c +++ b/trunk/drivers/scsi/dpt_i2o.c @@ -2445,7 +2445,7 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd) hba_status = detailed_status >> 8; // calculate resid for sg - scsi_set_resid(cmd, scsi_bufflen(cmd) - readl(reply+5)); + scsi_set_resid(cmd, scsi_bufflen(cmd) - readl(reply+20)); pHba = (adpt_hba*) cmd->device->host->hostdata[0]; @@ -2456,7 +2456,7 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd) case I2O_SCSI_DSC_SUCCESS: cmd->result = (DID_OK << 16); // handle underflow - if(readl(reply+5) < cmd->underflow ) { + if (readl(reply+20) < cmd->underflow) { cmd->result = (DID_ERROR <<16); printk(KERN_WARNING"%s: SCSI CMD underflow\n",pHba->name); }