aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorBrian King <brking@us.ibm.com>2006-11-21 10:28:04 -0600
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-11-22 12:20:08 -0600
commit04d9768ff8847b0ae8c41ac3cfb3c5bb2e31699a (patch)
treea25cce9de6d4b7a297deb57e04698b76fe285bbd /drivers/scsi
parent73d98ff0fa8d9074792b7273f57d9f92810104c6 (diff)
[SCSI] ipr: Stop issuing cancel all to disk arrays
The ipr disk array devices do not support a cancel all requests primitive, so change the ipr driver to never send it. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ipr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index c983f0f0758..244173adf8b 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3776,7 +3776,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
*/
if (ioa_cfg->in_reset_reload || ioa_cfg->ioa_is_dead)
return FAILED;
- if (!res || (!ipr_is_gscsi(res) && !ipr_is_vset_device(res)))
+ if (!res || !ipr_is_gscsi(res))
return FAILED;
list_for_each_entry(ipr_cmd, &ioa_cfg->pending_q, queue) {