A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages 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
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__);
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",
__func__);
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__);
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",
__func__);
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__);
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",
__func__);
return -EPROBE_DEFER;