Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 807fb6d8 authored Nov 21, 2012 by Saurav Kashyap Committed by James Bottomley Nov 30, 2012

[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>

parent 8c0bc701

drivers/scsi/qla2xxx/qla_os.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4230,7 +4230,7 @@ qla83xx_need_reset_handler(scsi_qla_host_t *vha)
	while (1) {		while (1) {
	qla83xx_rd_reg(vha, QLA83XX_IDC_DRIVER_ACK, &drv_ack);		qla83xx_rd_reg(vha, QLA83XX_IDC_DRIVER_ACK, &drv_ack);
	qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence);		qla83xx_rd_reg(vha, QLA83XX_IDC_DRV_PRESENCE, &drv_presence);
	if (drv_ack == drv_presence)		if ((drv_ack & drv_presence) == drv_presence)
	break;		break;

	if (time_after_eq(jiffies, ack_timeout)) {		if (time_after_eq(jiffies, ack_timeout)) {