Commit 3d05fc82 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional() 



Any return value from gpiod_get_optional() other than a pointer to a
GPIO descriptor or a NULL-pointer is an error and the driver should
abort probing. That being said: commit 56d074d2 ("Bluetooth: hci_qca:
don't use IS_ERR_OR_NULL() with gpiod_get_optional()") no longer sets
power_ctrl_enabled on NULL-pointer returned by
devm_gpiod_get_optional(). Restore this behavior but bail-out on errors.
While at it: also bail-out on error returned when trying to get the
"swctrl" GPIO.

Reported-by: default avatarWren Turkal <wt@penguintechs.org>
Reported-by: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Closes: https://lore.kernel.org/linux-bluetooth/1713449192-25926-2-git-send-email-quic_zijuhu@quicinc.com/


Fixes: 56d074d2 ("Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional()")
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tested-by: default avatarWren Turkal" <wt@penguintechs.org>
Reported-by: default avatarWren Turkal <wt@penguintechs.org>
Reported-by: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Reviewed-by: default avatarKrzysztof <Kozlowski&lt;krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 88cd6e6b

drivers/bluetooth/hci_qca.c

+13 −5
Original line number Diff line number Diff line
@@ -2332,16 +2332,21 @@ static int qca_serdev_probe(struct serdev_device *serdev) 
		    (data->soc_type == QCA_WCN6750 ||

		     data->soc_type == QCA_WCN6855)) {

			dev_err(&serdev->dev, "failed to acquire BT_EN gpio\n");

			power_ctrl_enabled = false;

			return PTR_ERR(qcadev->bt_en);

		}



		if (!qcadev->bt_en)

			power_ctrl_enabled = false;



		qcadev->sw_ctrl = devm_gpiod_get_optional(&serdev->dev, "swctrl",

					       GPIOD_IN);

		if (IS_ERR(qcadev->sw_ctrl) &&

		    (data->soc_type == QCA_WCN6750 ||

		     data->soc_type == QCA_WCN6855 ||

		     data->soc_type == QCA_WCN7850))

			dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n");

		     data->soc_type == QCA_WCN7850)) {

			dev_err(&serdev->dev, "failed to acquire SW_CTRL gpio\n");

			return PTR_ERR(qcadev->sw_ctrl);

		}



		qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);

		if (IS_ERR(qcadev->susclk)) {
@@ -2360,10 +2365,13 @@ static int qca_serdev_probe(struct serdev_device *serdev) 
		qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",

					       GPIOD_OUT_LOW);

		if (IS_ERR(qcadev->bt_en)) {

			dev_warn(&serdev->dev, "failed to acquire enable gpio\n");

			power_ctrl_enabled = false;

			dev_err(&serdev->dev, "failed to acquire enable gpio\n");

			return PTR_ERR(qcadev->bt_en);

		}



		if (!qcadev->bt_en)

			power_ctrl_enabled = false;



		qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);

		if (IS_ERR(qcadev->susclk)) {

			dev_warn(&serdev->dev, "failed to acquire clk\n");