[AUTOSEL,for,4.15,03/78] Bluetooth: hci_qca: Avoid setup failure on missing rampatch

Message ID 20180308045525.7662-3-alexander.levin@microsoft.com
State New
Headers show
  • [AUTOSEL,for,4.15,01/78] ipmi_si: Fix error handling of platform device
Related show

Commit Message

Sasha Levin March 8, 2018, 4:56 a.m.
From: Loic Poulain <loic.poulain@linaro.org>

[ Upstream commit ba8f3597900291a93604643017fff66a14546015 ]

Assuming that the original code idea was to enable in-band sleeping
only if the setup_rome method returns succes and run in 'standard'
mode otherwise, we should not return setup_rome return value which
makes qca_setup fail if no rampatch/nvm file found.

This fixes BT issue on the dragonboard-820C p4 which includes the
following QCA controller:
hci0: Product:0x00000008
hci0: Patch  :0x00000111
hci0: ROM    :0x00000302
hci0: SOC    :0x00000044

Since there is no rampatch for this controller revision, just make
it work as is.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>

 drivers/bluetooth/hci_qca.c | 3 +++
 1 file changed, 3 insertions(+)



diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index bbd7db7384e6..05ec530b8a3a 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -932,6 +932,9 @@  static int qca_setup(struct hci_uart *hu)
 	if (!ret) {
 		set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
+	} else if (ret == -ENOENT) {
+		/* No patch/nvm-config found, run with original fw/config */
+		ret = 0;
 	/* Setup bdaddr */