lkml.org 
[lkml]   [2012]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 052/108] Bluetooth: Use USB_VENDOR_AND_INTERFACE() for Broadcom devices
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

    commit 92c385f46b30f4954e9dd2d2005c12d233b479ea upstream.

    Many Broadcom devices has a vendor specific devices class, with this rule
    we match all existent and future controllers with this behavior.

    We also remove old rules to that matches product id for Broadcom devices.

    Tested-by: John Hommel <john.hommel@hp.com>
    Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/bluetooth/btusb.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
    index 2fe7776..e791b20 100644
    --- a/drivers/bluetooth/btusb.c
    +++ b/drivers/bluetooth/btusb.c
    @@ -94,16 +94,14 @@ static struct usb_device_id btusb_table[] = {

    /* Broadcom BCM20702A0 */
    { USB_DEVICE(0x0489, 0xe042) },
    - { USB_DEVICE(0x0a5c, 0x21e3) },
    - { USB_DEVICE(0x0a5c, 0x21e6) },
    - { USB_DEVICE(0x0a5c, 0x21e8) },
    - { USB_DEVICE(0x0a5c, 0x21f3) },
    - { USB_DEVICE(0x0a5c, 0x21f4) },
    { USB_DEVICE(0x413c, 0x8197) },

    /* Foxconn - Hon Hai */
    { USB_DEVICE(0x0489, 0xe033) },

    + /*Broadcom devices with vendor specific id */
    + { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
    +
    { } /* Terminating entry */
    };




    \
     
     \ /
      Last update: 2012-10-08 03:01    [W:4.133 / U:1.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site