tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver
[ALSA] ASoC: build fix for snd_soc_info_bool_ext
[ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect
[ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic"
[ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event

Linus Torvalds 5dc93cf4 43f14d85

+11 -7
unified split
+1 -1
include/sound/soc.h
··· 238 struct snd_ctl_elem_info *uinfo); 239 int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, 240 struct snd_ctl_elem_info *uinfo); 241 - #define snd_soc_info_bool_ext snd_ctl_boolean_mono 242 int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, 243 struct snd_ctl_elem_value *ucontrol); 244 int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
··· 238 struct snd_ctl_elem_info *uinfo); 239 int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, 240 struct snd_ctl_elem_info *uinfo); 241 + #define snd_soc_info_bool_ext snd_ctl_boolean_mono_info 242 int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, 243 struct snd_ctl_elem_value *ucontrol); 244 int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
+2 -2
sound/soc/codecs/tlv320aic3x.c
··· 539 {"HPRCOM", NULL, "Right HP Com"}, 540 541 /* Mono Output */ 542 - {"MONOLOUT", NULL, "Mono Out"}, 543 - {"MONOLOUT", NULL, "Mono Out"}, 544 545 /* Left Input */ 546 {"Left Line1L Mux", "single-ended", "LINE1L"},
··· 539 {"HPRCOM", NULL, "Right HP Com"}, 540 541 /* Mono Output */ 542 + {"MONO_LOUT", NULL, "Mono Out"}, 543 + {"MONO_LOUT", NULL, "Mono Out"}, 544 545 /* Left Input */ 546 {"Left Line1L Mux", "single-ended", "LINE1L"},
+1 -1
sound/soc/fsl/fsl_ssi.c
··· 416 * to put data into its FIFO. Without it, ALSA starts 417 * to complain about overruns. 418 */ 419 - msleep(1); 420 } 421 break; 422
··· 416 * to put data into its FIFO. Without it, ALSA starts 417 * to complain about overruns. 418 */ 419 + mdelay(1); 420 } 421 break; 422
+2 -2
sound/soc/omap/n810.c
··· 188 static const char *spk_function[] = {"Off", "On"}; 189 static const char *jack_function[] = {"Off", "Headphone"}; 190 static const struct soc_enum n810_enum[] = { 191 - SOC_ENUM_SINGLE_EXT(2, spk_function), 192 - SOC_ENUM_SINGLE_EXT(3, jack_function), 193 }; 194 195 static const struct snd_kcontrol_new aic33_n810_controls[] = {
··· 188 static const char *spk_function[] = {"Off", "On"}; 189 static const char *jack_function[] = {"Off", "Headphone"}; 190 static const struct soc_enum n810_enum[] = { 191 + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function), 192 + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(jack_function), jack_function), 193 }; 194 195 static const struct snd_kcontrol_new aic33_n810_controls[] = {
+5 -1
sound/synth/emux/emux_synth.c
··· 341 case MIDI_CTL_SOFT_PEDAL: 342 #ifdef SNDRV_EMUX_USE_RAW_EFFECT 343 /* FIXME: this is an emulation */ 344 - snd_emux_send_effect(port, chan, EMUX_FX_CUTOFF, -160, 345 EMUX_FX_FLAG_ADD); 346 #endif 347 break; 348
··· 341 case MIDI_CTL_SOFT_PEDAL: 342 #ifdef SNDRV_EMUX_USE_RAW_EFFECT 343 /* FIXME: this is an emulation */ 344 + if (chan->control[type] >= 64) 345 + snd_emux_send_effect(port, chan, EMUX_FX_CUTOFF, -160, 346 EMUX_FX_FLAG_ADD); 347 + else 348 + snd_emux_send_effect(port, chan, EMUX_FX_CUTOFF, 0, 349 + EMUX_FX_FLAG_OFF); 350 #endif 351 break; 352