]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Bluetooth: btsdio: Do not bind to non-removable BCM4356
authorPeter Robinson <pbrobinson@gmail.com>
Sun, 30 Jun 2019 22:14:08 +0000 (23:14 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Sat, 6 Jul 2019 10:27:55 +0000 (12:27 +0200)
BCM4356 devices soldered onto the PCB (non-removable) use an UART
connection for bluetooth, such as the Rock960, but it also advertise
btsdio support as a sdio function.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
CC: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/btsdio.c

index 83748b7b20337b2743df1df6ab8672c01acf68a1..fd9571d5fdac923baddf1205103f041371fdd068 100644 (file)
@@ -286,6 +286,7 @@ static int btsdio_probe(struct sdio_func *func,
                switch (func->device) {
                case SDIO_DEVICE_ID_BROADCOM_43341:
                case SDIO_DEVICE_ID_BROADCOM_43430:
+               case SDIO_DEVICE_ID_BROADCOM_4356:
                        return -ENODEV;
                }
        }