Unverified Commit b2e20aab authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2287 scsi: lpfc: Fix ioremap issues in lpfc_sli4_pci_mem_setup() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yong Hu <yong.hu@windriver.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LDG6S4DVJPTUUUHSUSWYU4LPB2VDWUGY/ 
 
https://gitee.com/openeuler/kernel/issues/I7ZCDZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/2287

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents c01c470f 36e7feb1

drivers/scsi/lpfc/lpfc_init.c

+6 −4
Original line number Diff line number Diff line
@@ -10477,7 +10477,7 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba) 
				goto out_iounmap_all;

		} else {

			error = -ENOMEM;

			goto out_iounmap_all;

			goto out_iounmap_ctrl;

		}

	}
@@ -10495,7 +10495,7 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba) 
			dev_err(&pdev->dev,

			   "ioremap failed for SLI4 HBA dpp registers.\n");

			error = -ENOMEM;

			goto out_iounmap_ctrl;

			goto out_iounmap_all;

		}

		phba->pci_bar4_memmap_p = phba->sli4_hba.dpp_regs_memmap_p;

	}
@@ -10520,8 +10520,10 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba) 
	return 0;



out_iounmap_all:

	if (phba->sli4_hba.drbl_regs_memmap_p)

		iounmap(phba->sli4_hba.drbl_regs_memmap_p);

out_iounmap_ctrl:

	if (phba->sli4_hba.ctrl_regs_memmap_p)

		iounmap(phba->sli4_hba.ctrl_regs_memmap_p);

out_iounmap_conf:

	iounmap(phba->sli4_hba.conf_regs_memmap_p);