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

Merge "asoc: codecs: bolero: Do not return error for unused gpio"

Browse Source
This commit is contained in:
qctecmdr
2019-10-12 08:58:56 -07:00
committed by Gerrit - the friendly Code Review server
parent d9328bec09 b44e4551b1
commit 75b962681c
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
asoc/codecs/bolero/rx-macro.c
View File

@@ -3904,7 +3904,8 @@ static int rx_macro_probe(struct platform_device *pdev)
__func__); __func__);
return -EINVAL; return -EINVAL;
} }
if (msm_cdc_pinctrl_get_state(rx_priv->rx_swr_gpio_p) < 0) { if (msm_cdc_pinctrl_get_state(rx_priv->rx_swr_gpio_p) < 0 &&
is_used_rx_swr_gpio) {
dev_err(&pdev->dev, "%s: failed to get swr pin state\n", dev_err(&pdev->dev, "%s: failed to get swr pin state\n",
__func__); __func__);
return -EPROBE_DEFER; return -EPROBE_DEFER;

3
asoc/codecs/bolero/tx-macro.c
View File

@@ -2395,7 +2395,8 @@ static int tx_macro_probe(struct platform_device *pdev)
__func__); __func__);
return -EINVAL; return -EINVAL;
} }
if (msm_cdc_pinctrl_get_state(tx_priv->tx_swr_gpio_p) < 0) { if (msm_cdc_pinctrl_get_state(tx_priv->tx_swr_gpio_p) < 0 &&
is_used_tx_swr_gpio) {
dev_err(&pdev->dev, "%s: failed to get swr pin state\n", dev_err(&pdev->dev, "%s: failed to get swr pin state\n",
__func__); __func__);
return -EPROBE_DEFER; return -EPROBE_DEFER;

3
asoc/codecs/bolero/wsa-macro.c
View File

@@ -3138,7 +3138,8 @@ static int wsa_macro_probe(struct platform_device *pdev)
__func__); __func__);
return -EINVAL; return -EINVAL;
} }
if (msm_cdc_pinctrl_get_state(wsa_priv->wsa_swr_gpio_p) < 0) { if (msm_cdc_pinctrl_get_state(wsa_priv->wsa_swr_gpio_p) < 0 &&
is_used_wsa_swr_gpio) {
dev_err(&pdev->dev, "%s: failed to get swr pin state\n", dev_err(&pdev->dev, "%s: failed to get swr pin state\n",
__func__); __func__);
return -EPROBE_DEFER; return -EPROBE_DEFER;