iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: amd: acp: Add error handling cases

Browse Source 
Add error handling in acp pci driver probe function.

Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>
Reviewed-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/20220721062043.3016985-5-venkataprasad.potturu@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Venkata Prasad Potturu
2022-07-21 11:50:37 +05:30
committed by Mark Brown
parent 96b008a1c2
commit c49f5e74a1
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/amd/acp/acp-pci.c
View File

@ -70,7 +70,8 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
ret = pci_request_regions(pci, "AMD ACP3x audio"); ret = pci_request_regions(pci, "AMD ACP3x audio");
if (ret < 0) { if (ret < 0) {
dev_err(&pci->dev, "pci_request_regions failed\n"); dev_err(&pci->dev, "pci_request_regions failed\n");
return -ENOMEM; ret = -ENOMEM;
goto disable_pci;
} }
pci_set_master(pci); pci_set_master(pci);
@ -89,22 +90,29 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
break; break;
default: default:
dev_err(dev, "Unsupported device revision:0x%x\n", pci->revision); dev_err(dev, "Unsupported device revision:0x%x\n", pci->revision);
return -EINVAL; ret = -EINVAL;
goto release_regions;
} }
dmic_dev = platform_device_register_data(dev, "dmic-codec", PLATFORM_DEVID_NONE, NULL, 0); dmic_dev = platform_device_register_data(dev, "dmic-codec", PLATFORM_DEVID_NONE, NULL, 0);
if (IS_ERR(dmic_dev)) { if (IS_ERR(dmic_dev)) {
dev_err(dev, "failed to create DMIC device\n"); dev_err(dev, "failed to create DMIC device\n");
return PTR_ERR(dmic_dev); ret = PTR_ERR(dmic_dev);
goto release_regions;
} }
addr = pci_resource_start(pci, 0); addr = pci_resource_start(pci, 0);
chip->base = devm_ioremap(&pci->dev, addr, pci_resource_len(pci, 0)); chip->base = devm_ioremap(&pci->dev, addr, pci_resource_len(pci, 0));
if (!chip->base) {
ret = -ENOMEM;
goto release_regions;
}
res = devm_kzalloc(&pci->dev, sizeof(struct resource) * num_res, GFP_KERNEL); res = devm_kzalloc(&pci->dev, sizeof(struct resource) * num_res, GFP_KERNEL);
if (!res) { if (!res) {
platform_device_unregister(dmic_dev); platform_device_unregister(dmic_dev);
return -ENOMEM; ret = -ENOMEM;
goto release_regions;
} }
for (i = 0; i < num_res; i++, res_acp++) { for (i = 0; i < num_res; i++, res_acp++) {
@ -133,8 +141,16 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
dev_err(&pci->dev, "cannot register %s device\n", pdevinfo.name); dev_err(&pci->dev, "cannot register %s device\n", pdevinfo.name);
platform_device_unregister(dmic_dev); platform_device_unregister(dmic_dev);
ret = PTR_ERR(pdev); ret = PTR_ERR(pdev);
goto release_regions;
} }
return ret;
release_regions:
pci_release_regions(pci);
disable_pci:
pci_disable_device(pci);
return ret; return ret;
}; };