From: Takashi Iwai Date: Sun, 26 Jan 2020 08:31:34 +0000 (+0100) Subject: Merge branch 'for-linus' into for-next X-Git-Tag: efi-urgent-2020-02-09~8^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4;p=users%2Fdwmw2%2Flinux.git Merge branch 'for-linus' into for-next Resolve conflicts and correct the hex numbers, too. Signed-off-by: Takashi Iwai --- 9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4 diff --cc sound/usb/format.c index 5e7c4c7beff29,53922f73467f4..9260136e4c9bb --- a/sound/usb/format.c +++ b/sound/usb/format.c @@@ -292,10 -292,13 +292,13 @@@ static int line6_parse_audio_format_rat struct audioformat *fp) { switch (chip->usb_id) { - case USB_ID(0x0E41, 0x4241): /* Line6 Helix */ - case USB_ID(0x0E41, 0x4242): /* Line6 Helix Rack */ - case USB_ID(0x0E41, 0x4244): /* Line6 Helix LT */ - case USB_ID(0x0E41, 0x4246): /* Line6 HX-Stomp */ - case USB_ID(0x0E41, 0x4248): /* Line6 Helix >= fw 2.82 */ - case USB_ID(0x0E41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */ - case USB_ID(0x0E41, 0x424a): /* Line6 Helix LT >= fw 2.82 */ + case USB_ID(0x0e41, 0x4241): /* Line6 Helix */ + case USB_ID(0x0e41, 0x4242): /* Line6 Helix Rack */ + case USB_ID(0x0e41, 0x4244): /* Line6 Helix LT */ + case USB_ID(0x0e41, 0x4246): /* Line6 HX-Stomp */ ++ case USB_ID(0x0e41, 0x4248): /* Line6 Helix >= fw 2.82 */ ++ case USB_ID(0x0e41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */ ++ case USB_ID(0x0e41, 0x424a): /* Line6 Helix LT >= fw 2.82 */ /* supported rates: 48Khz */ kfree(fp->rate_table); fp->rate_table = kmalloc(sizeof(int), GFP_KERNEL);