From: Saurav Kashyap Date: Wed, 21 Nov 2012 07:40:36 +0000 (-0500) Subject: [SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set. X-Git-Tag: next-20121205~82^2~13 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=807fb6d8afad1552c6981256a83bc2c0ce4e2125;p=karo-tx-linux.git [SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set. Signed-off-by: Giridhar Malavali Signed-off-by: Saurav Kashyap Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 67f7b56e1b0b..9ad66a3abe12 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4230,7 +4230,7 @@ qla83xx_need_reset_handler(scsi_qla_host_t *vha) while (1) { qla83xx_rd_reg(vha, QLA83XX_IDC_DRIVER_ACK, &drv_ack); qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence); - if (drv_ack == drv_presence) + if ((drv_ack & drv_presence) == drv_presence) break; if (time_after_eq(jiffies, ack_timeout)) {