Merge tag 'sound-fix-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
"Just a few trivial small fixes"

* tag 'sound-fix-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: line6: fix a crash in line6_hwdep_write()
ALSA: seq: fix passing wrong pointer in function call of compatibility layer
ALSA: hda - Fix a failure of micmute led when having multi adcs
ALSA: line6: Fix POD X3 Live audio input

Changed files
+7 -6
sound
+1 -1
sound/core/seq/seq_compat.c
··· 58 58 goto error; 59 59 data->kernel = NULL; 60 60 61 - err = snd_seq_kernel_client_ctl(client->number, cmd, &data); 61 + err = snd_seq_kernel_client_ctl(client->number, cmd, data); 62 62 if (err < 0) 63 63 goto error; 64 64
+1 -1
sound/pci/hda/dell_wmi_helper.c
··· 49 49 removefunc = true; 50 50 if (dell_led_set_func(DELL_LED_MICMUTE, false) >= 0) { 51 51 dell_led_value = 0; 52 - if (spec->gen.num_adc_nids > 1) 52 + if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch) 53 53 codec_dbg(codec, "Skipping micmute LED control due to several ADCs"); 54 54 else { 55 55 dell_old_cap_hook = spec->gen.cap_sync_hook;
+1 -1
sound/pci/hda/thinkpad_helper.c
··· 62 62 removefunc = false; 63 63 } 64 64 if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) { 65 - if (spec->num_adc_nids > 1) 65 + if (spec->num_adc_nids > 1 && !spec->dyn_adc_switch) 66 66 codec_dbg(codec, 67 67 "Skipping micmute LED control due to several ADCs"); 68 68 else {
+2 -2
sound/usb/line6/driver.c
··· 604 604 } 605 605 606 606 data_copy = memdup_user(data, count); 607 - if (IS_ERR(ERR_PTR)) 608 - return -ENOMEM; 607 + if (IS_ERR(data_copy)) 608 + return PTR_ERR(data_copy); 609 609 610 610 rv = line6_send_raw_message(line6, data_copy, count); 611 611
+2 -1
sound/usb/line6/podhd.c
··· 317 317 if (pod->line6.properties->capabilities & LINE6_CAP_PCM) { 318 318 /* initialize PCM subsystem: */ 319 319 err = line6_init_pcm(line6, 320 - (id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties : 320 + (id->driver_info == LINE6_PODX3 || 321 + id->driver_info == LINE6_PODX3LIVE) ? &podx3_pcm_properties : 321 322 &podhd_pcm_properties); 322 323 if (err < 0) 323 324 return err;