OSDN Git Service

ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro
authorTakashi Iwai <tiwai@suse.de>
Wed, 25 Jul 2018 21:00:46 +0000 (23:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2018 06:35:04 +0000 (08:35 +0200)
commit650ca59a640ba016d3a29555cdbc5c2623c753e9
treec83b58e781bf2527d2b73c35dcea1f508c5a1156
parent5df13ba493746f4b4a4d8f8bbf7c6bc86c7a899b
ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro

[ 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/usb/quirks-table.h