From 8f99b2777a2de1a292ccde55483571ce3edd08cc Mon Sep 17 00:00:00 2001 From: Andrew Vasquez Date: Wed, 3 Jun 2009 09:55:18 -0700 Subject: [PATCH] --- yaml --- r: 148115 b: refs/heads/master c: 94b3aa47ac1ea0aa31b3f59ad121cdf55e038594 h: refs/heads/master i: 148113: 8cfd3ca0879051fa7e124d208a821c0347c75236 148111: 2e19cb2abac8666cad2b4fb18429dd6897e81522 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb59928ddf19..65fa4dcd9c15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbc8eb67da11a4972834f61fe4729f4c037a17c9 +refs/heads/master: 94b3aa47ac1ea0aa31b3f59ad121cdf55e038594 diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c index eb35d2050f7a..c8d0a176fea4 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_isr.c +++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c @@ -1211,7 +1211,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) /* * If RISC reports underrun and target does not report * it then we must have a lost frame, so tell upper - * layer to retry it by reporting a bus busy. + * layer to retry it by reporting an error. */ if (!(scsi_status & SS_RESIDUAL_UNDER)) { DEBUG2(printk("scsi(%ld:%d:%d:%d) Dropped " @@ -1221,7 +1221,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) cp->device->id, cp->device->lun, resid, scsi_bufflen(cp))); - cp->result = DID_BUS_BUSY << 16; + cp->result = DID_ERROR << 16; break; }