| Message ID | 1509967016-24224-1-git-send-email-loic.poulain@linaro.org |
|---|---|
| State | Accepted |
| Commit | 7bb518f468ab118d3ba521c80cf589f85592ceca |
| Headers | show |
| Series | Bluetooth: hci_qca: Avoid setup failure on missing rampatch | expand |
Hi Loic, > 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> > --- > drivers/bluetooth/hci_qca.c | 3 +++ > 1 file changed, 3 insertions(+) patch has been applied to bluetooth-next tree. Regards Marcel -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index bbd7db7..05ec530 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); qca_debugfs_init(hdev); + } else if (ret == -ENOENT) { + /* No patch/nvm-config found, run with original fw/config */ + ret = 0; } /* Setup bdaddr */
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> --- drivers/bluetooth/hci_qca.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html