samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "soc: swr-mstr: Handle error exit for swrm probe fail"

Browse Source
This commit is contained in:
qctecmdr
2021-03-05 02:56:53 -08:00
committed by Gerrit - the friendly Code Review server
parent 3443978168 39c95cbca4
commit 65a0b0d7eb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
soc/swr-mstr-ctrl.c
View File

@@ -2927,14 +2927,16 @@ static int swrm_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "%s: Looking up %s property failed\n", dev_err(&pdev->dev, "%s: Looking up %s property failed\n",
__func__, "qcom,swr-num-dev"); __func__, "qcom,swr-num-dev");
goto err_pdata_fail; mutex_unlock(&swrm->mlock);
goto err_parse_num_dev;
} else { } else {
if (swrm->num_dev > swrm->num_auto_enum) { if (swrm->num_dev > swrm->num_auto_enum) {
dev_err(&pdev->dev, "%s: num_dev %d > max limit %d\n", dev_err(&pdev->dev, "%s: num_dev %d > max limit %d\n",
__func__, swrm->num_dev, __func__, swrm->num_dev,
swrm->num_auto_enum); swrm->num_auto_enum);
ret = -EINVAL; ret = -EINVAL;
goto err_pdata_fail; mutex_unlock(&swrm->mlock);
goto err_parse_num_dev;
} else { } else {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
"max swr devices expected to attach - %d, supported auto_enum - %d\n", "max swr devices expected to attach - %d, supported auto_enum - %d\n",
@@ -2994,6 +2996,7 @@ static int swrm_probe(struct platform_device *pdev)
return 0; return 0;
err_irq_wakeup_fail: err_irq_wakeup_fail:
device_init_wakeup(swrm->dev, false); device_init_wakeup(swrm->dev, false);
err_parse_num_dev:
err_mstr_init_fail: err_mstr_init_fail:
swr_unregister_master(&swrm->master); swr_unregister_master(&swrm->master);
err_mstr_fail: err_mstr_fail: