[SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 67f7b56e1b0bcfe96ba9c1e0c18157978f68e0ec..9ad66a3abe12a4cf9857d3359cdf29cf6edfec39 100644 (file)
--- 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)) {