sound fixes for 4.9-rc1
Just a few trivial small fixes. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABAgAGBQJYAfDbAAoJEGwxgFQ9KSmkTe0QAI6QGGDDQH6hz+4Gp9pTsF71 +fHcuAVZWgd5T5EAQq+9Av2wiVtgl1Oc5J7bRooVfJYswQRx43xE0GKHkDwCYBqU HeiT+jpsv2sZdVVuG/t6vWXFyIMsQ0CJ8dW+i+oJ23Etdq+vb1TE1IlHk76iJlqX xX+ko/xrVksOndUHkgjn554edmIkpSKN/TDs9lZ/NdFkg1LnLR+r0ecgshUikBau jRqc3m8Fm5uWMtqosqWrjHQwG/1FJp6DVIcyJOYBF18Fnnmmh+gIKPEa0yUq0bpg Fbph1ANN2nYrbUK6wZfhgFBs1atACswrvXb81B2anekjz7Br1i271L7i+k7XexG9 A14/+CHgXDCAB888H8gg0H4tx7YGxXC3PhCO1b3dpX5My6M/C/52oFERjAG9a1jE DJLNjfgTXFsJxOP0RvBOv1doi4Npv9pxjt01MwkszMlisd1FBhvKUPDeRBQuHCCi dbKU26WVi5JlWKINnh82348DJ0qhES82oFIyGdxX3zgIuMwgOxeSOGLKB3C/p0OM SWYB1DvOOlHoA0sgqp0Ggkh002vRSTo/5ZW2DGvgkfaVnHCNjjp67XiMhzzXG3dg d5mjlSlmiADlWUj5mBjZFvFc1c8Hm9xcRpi138fnUvWhKfVkcrA9dwbdupkPzc2S 7MiI7GA8+LckjEIHKuf3 =CjWZ -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
050aaeab99
|
@ -58,7 +58,7 @@ static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned
|
|||
goto error;
|
||||
data->kernel = NULL;
|
||||
|
||||
err = snd_seq_kernel_client_ctl(client->number, cmd, &data);
|
||||
err = snd_seq_kernel_client_ctl(client->number, cmd, data);
|
||||
if (err < 0)
|
||||
goto error;
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,
|
|||
removefunc = true;
|
||||
if (dell_led_set_func(DELL_LED_MICMUTE, false) >= 0) {
|
||||
dell_led_value = 0;
|
||||
if (spec->gen.num_adc_nids > 1)
|
||||
if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch)
|
||||
codec_dbg(codec, "Skipping micmute LED control due to several ADCs");
|
||||
else {
|
||||
dell_old_cap_hook = spec->gen.cap_sync_hook;
|
||||
|
|
|
@ -62,7 +62,7 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,
|
|||
removefunc = false;
|
||||
}
|
||||
if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) {
|
||||
if (spec->num_adc_nids > 1)
|
||||
if (spec->num_adc_nids > 1 && !spec->dyn_adc_switch)
|
||||
codec_dbg(codec,
|
||||
"Skipping micmute LED control due to several ADCs");
|
||||
else {
|
||||
|
|
|
@ -604,8 +604,8 @@ line6_hwdep_write(struct snd_hwdep *hwdep, const char __user *data, long count,
|
|||
}
|
||||
|
||||
data_copy = memdup_user(data, count);
|
||||
if (IS_ERR(ERR_PTR))
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(data_copy))
|
||||
return PTR_ERR(data_copy);
|
||||
|
||||
rv = line6_send_raw_message(line6, data_copy, count);
|
||||
|
||||
|
|
|
@ -317,7 +317,8 @@ static int podhd_init(struct usb_line6 *line6,
|
|||
if (pod->line6.properties->capabilities & LINE6_CAP_PCM) {
|
||||
/* initialize PCM subsystem: */
|
||||
err = line6_init_pcm(line6,
|
||||
(id->driver_info == LINE6_PODX3) ? &podx3_pcm_properties :
|
||||
(id->driver_info == LINE6_PODX3 ||
|
||||
id->driver_info == LINE6_PODX3LIVE) ? &podx3_pcm_properties :
|
||||
&podhd_pcm_properties);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
|
Загрузка…
Ссылка в новой задаче