All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Marcel Holtmann <marcel@holtmann.org>,
	Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
	Wren Turkal <wt@penguintechs.org>,
	Zijun Hu <quic_zijuhu@quicinc.com>
Subject: [PATCH] Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional()
Date: Mon, 22 Apr 2024 15:00:36 +0200	[thread overview]
Message-ID: <20240422130036.31856-1-brgl@bgdev.pl> (raw)

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

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 56d074d26c58 ("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.

Reported-by: Wren Turkal <wt@penguintechs.org>
Reported-by: Zijun Hu <quic_zijuhu@quicinc.com>
Closes: https://lore.kernel.org/linux-bluetooth/1713449192-25926-2-git-send-email-quic_zijuhu@quicinc.com/
Fixes: 56d074d26c58 ("Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional()")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
 drivers/bluetooth/hci_qca.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 92fa20f5ac7d..739248c6d6b9 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -2327,9 +2327,12 @@ 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) &&
-- 
2.40.1


             reply	other threads:[~2024-04-22 13:00 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-22 13:00 Bartosz Golaszewski [this message]
2024-04-22 13:33 ` Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional() bluez.test.bot
2024-04-24  4:05 ` [PATCH] " Krzysztof Kozlowski
2024-04-24  4:55 ` quic_zijuhu
2024-04-24  5:07 ` Wren Turkal
2024-04-24  9:04   ` Bartosz Golaszewski
2024-04-24  9:32     ` quic_zijuhu
2024-04-24  9:50       ` Krzysztof Kozlowski
2024-04-24 11:16     ` Wren Turkal
2024-04-24 11:53       ` Wren Turkal
2024-04-24 11:56         ` Bartosz Golaszewski
2024-04-24 12:09           ` Wren Turkal
2024-04-24 12:17           ` Wren Turkal
2024-04-24 12:20             ` Bartosz Golaszewski
2024-04-24 12:23               ` Bartosz Golaszewski
2024-04-24 12:24               ` Wren Turkal
2024-04-24 12:27                 ` Bartosz Golaszewski
2024-04-24 12:30                   ` Wren Turkal
2024-04-24 12:57                     ` Bartosz Golaszewski
2024-04-24 12:57                   ` Wren Turkal
2024-04-24 13:12                   ` quic_zijuhu
2024-04-24 13:26                     ` Wren Turkal
2024-04-24 13:30                       ` quic_zijuhu
2024-04-24 22:09                         ` Wren Turkal
2024-04-24 13:53                       ` Bartosz Golaszewski
2024-04-24 22:17                         ` Wren Turkal
2024-04-24 23:35                           ` quic_zijuhu
2024-04-25  2:34                             ` Wren Turkal
2024-04-24 11:25     ` Wren Turkal
2024-04-24 11:53       ` Bartosz Golaszewski
2024-04-24 11:59         ` Wren Turkal
2024-04-24 12:01           ` Bartosz Golaszewski
2024-04-24 12:05             ` Wren Turkal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240422130036.31856-1-brgl@bgdev.pl \
    --to=brgl@bgdev.pl \
    --cc=bartosz.golaszewski@linaro.org \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luiz.dentz@gmail.com \
    --cc=marcel@holtmann.org \
    --cc=quic_zijuhu@quicinc.com \
    --cc=wt@penguintechs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.