Merge remote-tracking branch 'omap/for-next'

[karo-tx-linux.git] / drivers / bluetooth / hci_bcm.c

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 645e66e9a94594d26dbb8ee929c88cca11ef447b..cb852cc750b78256cd05fb62eda18dfb28c246aa 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -259,8 +259,8 @@ static int bcm_set_diag(struct hci_dev *hdev, bool enable)
                return -ENETDOWN;
 
        skb = bt_skb_alloc(3, GFP_KERNEL);
-       if (IS_ERR(skb))
-               return PTR_ERR(skb);
+       if (!skb)
+               return -ENOMEM;
 
        *skb_put(skb, 1) = BCM_LM_DIAG_PKT;
        *skb_put(skb, 1) = 0xf0;
@@ -799,6 +799,7 @@ static int bcm_remove(struct platform_device *pdev)
 static const struct hci_uart_proto bcm_proto = {
        .id             = HCI_UART_BCM,
        .name           = "BCM",
+       .manufacturer   = 15,
        .init_speed     = 115200,
        .oper_speed     = 4000000,
        .open           = bcm_open,