|
@@ -31,6 +31,7 @@
|
|
|
#include <linux/errno.h>
|
|
|
#include <linux/skbuff.h>
|
|
|
|
|
|
+#include <linux/mmc/host.h>
|
|
|
#include <linux/mmc/sdio_ids.h>
|
|
|
#include <linux/mmc/sdio_func.h>
|
|
|
|
|
@@ -292,6 +293,14 @@ static int btsdio_probe(struct sdio_func *func,
|
|
|
tuple = tuple->next;
|
|
|
}
|
|
|
|
|
|
+ /* BCM43341 devices soldered onto the PCB (non-removable) use an
|
|
|
+ * uart connection for bluetooth, ignore the BT SDIO interface.
|
|
|
+ */
|
|
|
+ if (func->vendor == SDIO_VENDOR_ID_BROADCOM &&
|
|
|
+ func->device == SDIO_DEVICE_ID_BROADCOM_43341 &&
|
|
|
+ !mmc_card_is_removable(func->card->host))
|
|
|
+ return -ENODEV;
|
|
|
+
|
|
|
data = devm_kzalloc(&func->dev, sizeof(*data), GFP_KERNEL);
|
|
|
if (!data)
|
|
|
return -ENOMEM;
|