OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net: wwan: iosm: Fix error handling path in ipc_pcie_probe() 

Smatch reports:
	drivers/net/wwan/iosm/iosm_ipc_pcie.c:298 ipc_pcie_probe()
	warn: missing unwind goto?

When dma_set_mask fails it directly returns without disabling pci
device and freeing ipc_pcie. Fix this my calling a correct goto label

As dma_set_mask returns either 0 or -EIO, we can use a goto label, as
it finally returns -EIO.

Add a set_mask_fail goto label which stands consistent with other goto
labels in this function..

Fixes: 035e3befc1 ("net: wwan: iosm: fix driver not working with INTEL_IOMMU disabled")
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harshit Mogalapalli 2023-04-08 12:43:21 -07:00 committed by David S. Miller
parent 9744d2bf19
commit a56ef25619
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wwan/iosm/iosm_ipc_pcie.c
View File

@ -295,7 +295,7 @@ static int ipc_pcie_probe(struct pci_dev *pci,
ret = dma_set_mask(ipc_pcie->dev, DMA_BIT_MASK(64)); ret = dma_set_mask(ipc_pcie->dev, DMA_BIT_MASK(64));
if (ret) { if (ret) {
dev_err(ipc_pcie->dev, "Could not set PCI DMA mask: %d", ret); dev_err(ipc_pcie->dev, "Could not set PCI DMA mask: %d", ret);
return ret; goto set_mask_fail;
} }
ipc_pcie_config_aspm(ipc_pcie); ipc_pcie_config_aspm(ipc_pcie);
@ -323,6 +323,7 @@ static int ipc_pcie_probe(struct pci_dev *pci,
imem_init_fail: imem_init_fail:
ipc_pcie_resources_release(ipc_pcie); ipc_pcie_resources_release(ipc_pcie);
resources_req_fail: resources_req_fail:
set_mask_fail:
pci_disable_device(pci); pci_disable_device(pci);
pci_enable_fail: pci_enable_fail:
kfree(ipc_pcie); kfree(ipc_pcie);