diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-01-26 11:31:34 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-01-26 11:31:41 +0300 |
commit | 9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4 (patch) | |
tree | 986201af09ea4cd734ac5afa4a069cb9e56b78e9 /sound/usb/format.c | |
parent | 5396c4bd9fd8429050f6191663b6c491e6402da2 (diff) | |
parent | b81cbf7abfc94878a3c6f0789f2185ee55b1cc21 (diff) | |
download | linux-9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4.tar.xz |
Merge branch 'for-linus' into for-next
Resolve conflicts and correct the hex numbers, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/format.c')
-rw-r--r-- | sound/usb/format.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index 5e7c4c7beff2..9260136e4c9b 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -296,6 +296,9 @@ static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip, 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); |