lkml.org 
[lkml]   [2018]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 10/88] ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit bd1cd0eb2ce9141100628d476ead4de485501b29 ]

    AU0828_DEVICE() macro in quirks-table.h uses USB_DEVICE_VENDOR_SPEC()
    for expanding idVendor and idProduct fields. However, the latter
    macro adds also match_flags and bInterfaceClass, which are different
    from the values AU0828_DEVICE() macro sets after that.

    For fixing them, just expand idVendor and idProduct fields manually in
    AU0828_DEVICE().

    This fixes sparse warnings like:
    sound/usb/quirks-table.h:2892:1: warning: Initializer entry defined twice

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    sound/usb/quirks-table.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
    index 8aac48f9c322..08aa78007020 100644
    --- a/sound/usb/quirks-table.h
    +++ b/sound/usb/quirks-table.h
    @@ -2875,7 +2875,8 @@ YAMAHA_DEVICE(0x7010, "UB99"),
    */

    #define AU0828_DEVICE(vid, pid, vname, pname) { \
    - USB_DEVICE_VENDOR_SPEC(vid, pid), \
    + .idVendor = vid, \
    + .idProduct = pid, \
    .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
    USB_DEVICE_ID_MATCH_INT_CLASS | \
    USB_DEVICE_ID_MATCH_INT_SUBCLASS, \
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-07 03:01    [W:5.342 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site