Commit ba8f3597 authored Nov 06, 2017 by Loic Poulain Committed by Marcel Holtmann Dec 13, 2017

Bluetooth: hci_qca: Avoid setup failure on missing rampatch



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>

parent 1313f054

drivers/bluetooth/hci_qca.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -932,6 +932,9 @@ static int qca_setup(struct hci_uart *hu)
	if (!ret) {		if (!ret) {
	set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);		set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
	qca_debugfs_init(hdev);		qca_debugfs_init(hdev);
			} else if (ret == -ENOENT) {
			/* No patch/nvm-config found, run with original fw/config */
			ret = 0;
	}		}

	/* Setup bdaddr */		/* Setup bdaddr */