Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc93cf4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 43f14d85 3c172791

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

#define snd_soc_info_bool_ext		snd_ctl_boolean_mono

#define snd_soc_info_bool_ext		snd_ctl_boolean_mono_info

int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,

sound/soc/codecs/tlv320aic3x.c

+2 −2
Original line number Diff line number Diff line
@@ -539,8 +539,8 @@ static const char *intercon[][3] = { 
	{"HPRCOM", NULL, "Right HP Com"},



	/* Mono Output */

	{"MONOLOUT", NULL, "Mono Out"},

	{"MONOLOUT", NULL, "Mono Out"},

	{"MONO_LOUT", NULL, "Mono Out"},

	{"MONO_LOUT", NULL, "Mono Out"},



	/* Left Input */

	{"Left Line1L Mux", "single-ended", "LINE1L"},

sound/soc/fsl/fsl_ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd) 
			 * to put data into its FIFO.  Without it, ALSA starts

			 * to complain about overruns.

			 */

			msleep(1);

			mdelay(1);

		}

		break;

sound/soc/omap/n810.c

+2 −2
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ static const char *audio_map[][3] = { 
static const char *spk_function[] = {"Off", "On"};

static const char *jack_function[] = {"Off", "Headphone"};

static const struct soc_enum n810_enum[] = {

	SOC_ENUM_SINGLE_EXT(2, spk_function),

	SOC_ENUM_SINGLE_EXT(3, jack_function),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(jack_function), jack_function),

};



static const struct snd_kcontrol_new aic33_n810_controls[] = {

sound/synth/emux/emux_synth.c

+5 −1
Original line number Diff line number Diff line
@@ -341,8 +341,12 @@ snd_emux_control(void *p, int type, struct snd_midi_channel *chan) 
	case MIDI_CTL_SOFT_PEDAL:

#ifdef SNDRV_EMUX_USE_RAW_EFFECT

		/* FIXME: this is an emulation */

		if (chan->control[type] >= 64)

			snd_emux_send_effect(port, chan, EMUX_FX_CUTOFF, -160,

				     EMUX_FX_FLAG_ADD);

		else

			snd_emux_send_effect(port, chan, EMUX_FX_CUTOFF, 0,

				     EMUX_FX_FLAG_OFF);

#endif

		break;