qla2xxx: fix rwlock recursion

[PATCH] qla2xxx: Fix rwlock recursion

Fixes 8dfa4b5a9b44 ("qla2xxx: Fix sparse annotation")

Signed-off-by Bart Van Assche <[email protected]>

Reported-by Himanshu Madhani <[email protected]>

Cc Giridhar Malavali <[email protected]>

---
  drivers/scsi/qla2xxx/qla_nx.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

drivers/scsi/qla2xxx/qla_nx.c +1 -1

index eb0cc54..b6b4cfd 100644
@@ -433,7 +433,7 @@ qla82xx_pci_get_crb_addr_2M(struct qla_hw_data *ha, 
 ulong off_in,
  	if (off_in < QLA82XX_PCI_CRBSPACE)
  		return -1;
 
-	*off_out = (void __iomem *)(off_in - QLA82XX_PCI_CRBSPACE);
+	off_in -= QLA82XX_PCI_CRBSPACE;
 
  	/* Try direct map */

  	m = &crb_128M_2M_map[CRB_BLK(off_in)].sub_block[CRB_SUBBLK(off_in)];

drivers/scsi/qla2xxx/qla_nx.c +1 -0

@@ -443,6 +443,7 @@ qla82xx_pci_get_crb_addr_2M(struct qla_hw_data *ha, 
 ulong off_in,
  		return 0;
  	}
  	/* Not in direct map, use crb window */
+	*off_out = (void __iomem *)off_in;
  	return 1;
  }

Signature · 2 lines

-- 
2.1.4