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

Commit 1166f985 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents dddf3e4c e9cf7049

sound/soc/codecs/cq93vc.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int cq93vc_resume(struct snd_soc_codec *codec) 


static int cq93vc_probe(struct snd_soc_codec *codec)

{

	struct davinci_vc *davinci_vc = codec->dev->platform_data;

	struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec);



	davinci_vc->cq93vc.codec = codec;

	codec->control_data = davinci_vc;

sound/soc/soc-dapm.c

+3 −3
Original line number Diff line number Diff line
@@ -1779,7 +1779,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, 
	int max = mc->max;

	unsigned int mask = (1 << fls(max)) - 1;

	unsigned int invert = mc->invert;

	unsigned int val, val_mask;

	unsigned int val;

	int connect, change;

	struct snd_soc_dapm_update update;
@@ -1787,13 +1787,13 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, 


	if (invert)

		val = max - val;

	val_mask = mask << shift;

	mask = mask << shift;

	val = val << shift;



	mutex_lock(&widget->codec->mutex);

	widget->value = val;



	change = snd_soc_test_bits(widget->codec, reg, val_mask, val);

	change = snd_soc_test_bits(widget->codec, reg, mask, val);

	if (change) {

		if (val)

			/* new connection */