summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorSantiago Leon <santil@us.ibm.com>2006-10-13 10:22:50 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-10-25 15:13:17 -0700
commit9c3121feef7e1fba86f74b2677e6f54e7153d149 (patch)
tree70f94b04793d554ce38240fccddbc992243ec250 /drivers/scsi
parent7c83a3ceb6d06e7cb908f5102687c9661e7d4d0a (diff)
downloadblackbird-obmc-linux-9c3121feef7e1fba86f74b2677e6f54e7153d149.tar.gz
blackbird-obmc-linux-9c3121feef7e1fba86f74b2677e6f54e7153d149.zip
[SCSI] ibmvscsi: correctly reenable CRQ
The "ibmvscsi: treat busy and error conditions separately" patch submitted by Dave Boutcher back in June incorrectly reenables the CRQ. The broken logic causes the adapter to get disabled if the CRQ connection happens to close temporarily. This patch "fixes that obviously wrong logic check" (Dave's words). Signed-off-by: Santiago Leon <santil@us.ibm.com> Signed-off-by: David Boutcher <sleddog@us.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ibmvscsi/ibmvscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 669ea4fff166..fbc1d5c3b0a7 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1213,7 +1213,7 @@ void ibmvscsi_handle_crq(struct viosrp_crq *crq,
"ibmvscsi: Re-enabling adapter!\n");
purge_requests(hostdata, DID_REQUEUE);
if ((ibmvscsi_reenable_crq_queue(&hostdata->queue,
- hostdata) == 0) ||
+ hostdata)) ||
(ibmvscsi_send_crq(hostdata,
0xC001000000000000LL, 0))) {
atomic_set(&hostdata->request_limit,
OpenPOWER on IntegriCloud