Skip to content

Commit c487606

Browse files
linvjwlinvjw
committed
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: net/nfc/netlink.c Signed-off-by: John W. Linville <linville@tuxdriver.com>
2 parents d9f72f3 + 97ea6d0 commit c487606

File tree

148 files changed

+3919
-3413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+3919
-3413
lines changed

‎Documentation/feature-removal-schedule.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -508,18 +508,6 @@ Who: Kees Cook <keescook@chromium.org>
508508

509509
----------------------------
510510

511-
What: Removing the pn544 raw driver.
512-
When: 3.6
513-
Why: With the introduction of the NFC HCI and SHDL kernel layers, pn544.c
514-
is being replaced by pn544_hci.c which is accessible through the netlink
515-
and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to
516-
work properly with the latest Android stacks.
517-
Having 2 drivers for the same hardware is confusing and as such we
518-
should only keep the one following the kernel NFC APIs.
519-
Who: Samuel Ortiz <sameo@linux.intel.com>
520-
521-
----------------------------
522-
523511
What: setitimer accepts user NULL pointer (value)
524512
When: 3.6
525513
Why: setitimer is not returning -EFAULT if user pointer is NULL. This

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4797,6 +4797,7 @@ M: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
47974797
M: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
47984798
M: Samuel Ortiz <sameo@linux.intel.com>
47994799
L: linux-wireless@vger.kernel.org
4800+
L: linux-nfc@lists.01.org (moderated for non-subscribers)
48004801
S: Maintained
48014802
F: net/nfc/
48024803
F: include/linux/nfc.h

‎drivers/bcma/host_pci.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
273273
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
274274
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
275275
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
276+
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
276277
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
277278
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
278279
{ 0, },

‎drivers/bcma/sprom.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,9 @@ static bool bcma_sprom_onchip_available(struct bcma_bus *bus)
507507
/* for these chips OTP is always available */
508508
present = true;
509509
break;
510+
case BCMA_CHIP_ID_BCM43227:
510511
case BCMA_CHIP_ID_BCM43228:
512+
case BCMA_CHIP_ID_BCM43428:
511513
present = chip_status & BCMA_CC_CHIPST_43228_OTP_PRESENT;
512514
break;
513515
default:

‎drivers/bluetooth/bluecard_cs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb)
681681
case HCI_SCODATA_PKT:
682682
hdev->stat.sco_tx++;
683683
break;
684-
};
684+
}
685685

686686
/* Prepend skb with frame type */
687687
memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

‎drivers/bluetooth/btmrvl_sdio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
600600
exit:
601601
if (ret) {
602602
hdev->stat.err_rx++;
603-
if (skb)
604-
kfree_skb(skb);
603+
kfree_skb(skb);
605604
}
606605

607606
return ret;

‎drivers/bluetooth/btuart_cs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb)
446446
case HCI_SCODATA_PKT:
447447
hdev->stat.sco_tx++;
448448
break;
449-
};
449+
}
450450

451451
/* Prepend skb with frame type */
452452
memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

‎drivers/bluetooth/btusb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@ static struct usb_device_id btusb_table[] = {
9696
{ USB_DEVICE(0x0c10, 0x0000) },
9797

9898
/* Broadcom BCM20702A0 */
99+
{ USB_DEVICE(0x04ca, 0x2003) },
99100
{ USB_DEVICE(0x0489, 0xe042) },
100101
{ USB_DEVICE(0x413c, 0x8197) },
101102

102103
/* Foxconn - Hon Hai */
103-
{ USB_DEVICE(0x0489, 0xe033) },
104+
{ USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) },
104105

105106
/*Broadcom devices with vendor specific id */
106107
{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },

‎drivers/bluetooth/btwilink.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -358,21 +358,7 @@ static struct platform_driver btwilink_driver = {
358358
},
359359
};
360360

361-
/* ------- Module Init/Exit interfaces ------ */
362-
static int __init btwilink_init(void)
363-
{
364-
BT_INFO("Bluetooth Driver for TI WiLink - Version %s", VERSION);
365-
366-
return platform_driver_register(&btwilink_driver);
367-
}
368-
369-
static void __exit btwilink_exit(void)
370-
{
371-
platform_driver_unregister(&btwilink_driver);
372-
}
373-
374-
module_init(btwilink_init);
375-
module_exit(btwilink_exit);
361+
module_platform_driver(btwilink_driver);
376362

377363
/* ------ Module Info ------ */
378364

‎drivers/bluetooth/hci_ldisc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,
531531
default:
532532
err = n_tty_ioctl_helper(tty, file, cmd, arg);
533533
break;
534-
};
534+
}
535535

536536
return err;
537537
}

0 commit comments

Comments
 (0)