Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75b96268 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents d9328bec b44e4551

asoc/codecs/bolero/rx-macro.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

asoc/codecs/bolero/tx-macro.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

asoc/codecs/bolero/wsa-macro.c

+2 −1
Original line number Diff line number Diff line
@@ -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;