Bluetooth: hci_qca: move the SoC type check to the right place

commit 0fb410c914eb03c7e9d821e26d03bac0a239e5db upstream.

Commit 3d05fc82237a ("Bluetooth: qca: set power_ctrl_enabled on NULL
returned by gpiod_get_optional()") accidentally changed the prevous
behavior where power control would be disabled without the BT_EN GPIO
only on QCA_WCN6750 and QCA_WCN6855 while also getting the error check
wrong. We should treat every IS_ERR() return value from
devm_gpiod_get_optional() as a reason to bail-out while we should only
set power_ctrl_enabled to false on the two models mentioned above. While
at it: use dev_err_probe() to save a LOC.

Cc: stable@vger.kernel.org
Fixes: 3d05fc82237a ("Bluetooth: qca: set power_ctrl_enabled on NULL returned by gpiod_get_optional()")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tested-by: Hsin-chen Chuang <chharry@chromium.org>
Reviewed-by: Hsin-chen Chuang <chharry@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index f2558506a02c72a7db50fd97e3bce83cfe141be4..04443356795971879b1f768bfa57a796ce583260 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -2415,14 +2415,14 @@ 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) &&
-                   (data->soc_type == QCA_WCN6750 ||
-                    data->soc_type == QCA_WCN6855)) {
-                       dev_err(&serdev->dev, "failed to acquire BT_EN gpio\n");
-                       return PTR_ERR(qcadev->bt_en);
-               }
+               if (IS_ERR(qcadev->bt_en))
+                       return dev_err_probe(&serdev->dev,
+                                            PTR_ERR(qcadev->bt_en),
+                                            "failed to acquire BT_EN gpio\n");
 
-               if (!qcadev->bt_en)
+               if (!qcadev->bt_en &&
+                   (data->soc_type == QCA_WCN6750 ||
+                    data->soc_type == QCA_WCN6855))
                        power_ctrl_enabled = false;
 
                qcadev->sw_ctrl = devm_gpiod_get_optional(&serdev->dev, "swctrl",