---

yaml --- r: 343752 b: refs/heads/master c: 807fb6d h: refs/heads/master v: v3
git-mirror · Nov 30, 2012 · 1f57e3d · 1f57e3d
1 parent 2cd165d
commit 1f57e3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c0bc701f9cd393119056cf6c9863bc5503cb0dd
+refs/heads/master: 807fb6d8afad1552c6981256a83bc2c0ce4e2125
diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/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)) {