From: Greg Kroah-Hartman Date: Fri, 3 Apr 2015 18:25:33 +0000 (+0200) Subject: 3.10-stable patches X-Git-Tag: v3.10.74~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4ef2a75a0d6b0bd1187b6b4715fc932b9020090;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch asoc-wm8903-fix-wrong-value-references-for-boolean-kctl.patch asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch --- diff --git a/queue-3.10/asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..3b4aa978b15 --- /dev/null +++ b/queue-3.10/asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,43 @@ +From 2bf4c1d483d911cda5dd385527194d23e5cea73d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:03 +0100 +Subject: ASoC: adav80x: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit 2bf4c1d483d911cda5dd385527194d23e5cea73d upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Acked-by: Lars-Peter Clausen +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/adav80x.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/adav80x.c ++++ b/sound/soc/codecs/adav80x.c +@@ -307,7 +307,7 @@ static int adav80x_put_deemph(struct snd + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec); +- unsigned int deemph = ucontrol->value.enumerated.item[0]; ++ unsigned int deemph = ucontrol->value.integer.value[0]; + + if (deemph > 1) + return -EINVAL; +@@ -323,7 +323,7 @@ static int adav80x_get_deemph(struct snd + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = adav80x->deemph; ++ ucontrol->value.integer.value[0] = adav80x->deemph; + return 0; + }; + diff --git a/queue-3.10/asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..ef3d3692e66 --- /dev/null +++ b/queue-3.10/asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,42 @@ +From 08641d9b7bf915144a57a736b42642e13eb1167f Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:04 +0100 +Subject: ASoC: ak4641: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit 08641d9b7bf915144a57a736b42642e13eb1167f upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/ak4641.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/ak4641.c ++++ b/sound/soc/codecs/ak4641.c +@@ -74,7 +74,7 @@ static int ak4641_put_deemph(struct snd_ + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec); +- int deemph = ucontrol->value.enumerated.item[0]; ++ int deemph = ucontrol->value.integer.value[0]; + + if (deemph > 1) + return -EINVAL; +@@ -90,7 +90,7 @@ static int ak4641_get_deemph(struct snd_ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = ak4641->deemph; ++ ucontrol->value.integer.value[0] = ak4641->deemph; + return 0; + }; + diff --git a/queue-3.10/asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..9c6962aeccb --- /dev/null +++ b/queue-3.10/asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,42 @@ +From 4c523ef61160b7d478371ddc9f48c8ce0a00d675 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:08 +0100 +Subject: ASoC: tas5086: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit 4c523ef61160b7d478371ddc9f48c8ce0a00d675 upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/tas5086.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/tas5086.c ++++ b/sound/soc/codecs/tas5086.c +@@ -173,7 +173,7 @@ static int tas5086_get_deemph(struct snd + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = priv->deemph; ++ ucontrol->value.integer.value[0] = priv->deemph; + + return 0; + } +@@ -184,7 +184,7 @@ static int tas5086_put_deemph(struct snd + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); + +- priv->deemph = ucontrol->value.enumerated.item[0]; ++ priv->deemph = ucontrol->value.integer.value[0]; + + return tas5086_set_deemph(codec); + } diff --git a/queue-3.10/asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..4a8d77a81fc --- /dev/null +++ b/queue-3.10/asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,61 @@ +From 00a14c2968e3d55817e0fa35c78106ca840537bf Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:09 +0100 +Subject: ASoC: wm2000: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit 00a14c2968e3d55817e0fa35c78106ca840537bf upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Acked-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm2000.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/sound/soc/codecs/wm2000.c ++++ b/sound/soc/codecs/wm2000.c +@@ -605,7 +605,7 @@ static int wm2000_anc_mode_get(struct sn + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); + +- ucontrol->value.enumerated.item[0] = wm2000->anc_active; ++ ucontrol->value.integer.value[0] = wm2000->anc_active; + + return 0; + } +@@ -615,7 +615,7 @@ static int wm2000_anc_mode_put(struct sn + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); +- int anc_active = ucontrol->value.enumerated.item[0]; ++ int anc_active = ucontrol->value.integer.value[0]; + int ret; + + if (anc_active > 1) +@@ -638,7 +638,7 @@ static int wm2000_speaker_get(struct snd + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); + +- ucontrol->value.enumerated.item[0] = wm2000->spk_ena; ++ ucontrol->value.integer.value[0] = wm2000->spk_ena; + + return 0; + } +@@ -648,7 +648,7 @@ static int wm2000_speaker_put(struct snd + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); +- int val = ucontrol->value.enumerated.item[0]; ++ int val = ucontrol->value.integer.value[0]; + int ret; + + if (val > 1) diff --git a/queue-3.10/asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..b9893b06b74 --- /dev/null +++ b/queue-3.10/asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,43 @@ +From bd14016fbf31aa199026f1e2358eab695f374eb1 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:10 +0100 +Subject: ASoC: wm8731: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit bd14016fbf31aa199026f1e2358eab695f374eb1 upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Acked-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8731.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/wm8731.c ++++ b/sound/soc/codecs/wm8731.c +@@ -121,7 +121,7 @@ static int wm8731_get_deemph(struct snd_ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = wm8731->deemph; ++ ucontrol->value.integer.value[0] = wm8731->deemph; + + return 0; + } +@@ -131,7 +131,7 @@ static int wm8731_put_deemph(struct snd_ + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); +- int deemph = ucontrol->value.enumerated.item[0]; ++ int deemph = ucontrol->value.integer.value[0]; + int ret = 0; + + if (deemph > 1) diff --git a/queue-3.10/asoc-wm8903-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-wm8903-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..2ba0e3c5709 --- /dev/null +++ b/queue-3.10/asoc-wm8903-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,43 @@ +From 24cc883c1fd16df34211ae41624aa6d3cd906693 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:11 +0100 +Subject: ASoC: wm8903: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit 24cc883c1fd16df34211ae41624aa6d3cd906693 upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Acked-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8903.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/wm8903.c ++++ b/sound/soc/codecs/wm8903.c +@@ -446,7 +446,7 @@ static int wm8903_get_deemph(struct snd_ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = wm8903->deemph; ++ ucontrol->value.integer.value[0] = wm8903->deemph; + + return 0; + } +@@ -456,7 +456,7 @@ static int wm8903_put_deemph(struct snd_ + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); +- int deemph = ucontrol->value.enumerated.item[0]; ++ int deemph = ucontrol->value.integer.value[0]; + int ret = 0; + + if (deemph > 1) diff --git a/queue-3.10/asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..03aade95aa5 --- /dev/null +++ b/queue-3.10/asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,43 @@ +From eaddf6fd959074f6a6e71deffe079c71eef35da6 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:12 +0100 +Subject: ASoC: wm8904: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit eaddf6fd959074f6a6e71deffe079c71eef35da6 upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Acked-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8904.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/wm8904.c ++++ b/sound/soc/codecs/wm8904.c +@@ -523,7 +523,7 @@ static int wm8904_get_deemph(struct snd_ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = wm8904->deemph; ++ ucontrol->value.integer.value[0] = wm8904->deemph; + return 0; + } + +@@ -532,7 +532,7 @@ static int wm8904_put_deemph(struct snd_ + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); +- int deemph = ucontrol->value.enumerated.item[0]; ++ int deemph = ucontrol->value.integer.value[0]; + + if (deemph > 1) + return -EINVAL; diff --git a/queue-3.10/asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..ecc5bf13c5f --- /dev/null +++ b/queue-3.10/asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,43 @@ +From 07892b10356f17717abdc578acbef72db86c880e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:13 +0100 +Subject: ASoC: wm8955: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit 07892b10356f17717abdc578acbef72db86c880e upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Acked-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8955.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/wm8955.c ++++ b/sound/soc/codecs/wm8955.c +@@ -393,7 +393,7 @@ static int wm8955_get_deemph(struct snd_ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = wm8955->deemph; ++ ucontrol->value.integer.value[0] = wm8955->deemph; + return 0; + } + +@@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_ + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); +- int deemph = ucontrol->value.enumerated.item[0]; ++ int deemph = ucontrol->value.integer.value[0]; + + if (deemph > 1) + return -EINVAL; diff --git a/queue-3.10/asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch b/queue-3.10/asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch new file mode 100644 index 00000000000..90d0df0e9fe --- /dev/null +++ b/queue-3.10/asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch @@ -0,0 +1,43 @@ +From b4a18c8b1af15ebfa9054a3d2aef7b0a7e6f2a05 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 Mar 2015 12:39:14 +0100 +Subject: ASoC: wm8960: Fix wrong value references for boolean kctl + +From: Takashi Iwai + +commit b4a18c8b1af15ebfa9054a3d2aef7b0a7e6f2a05 upstream. + +The correct values referred by a boolean control are +value.integer.value[], not value.enumerated.item[]. +The former is long while the latter is int, so it's even incompatible +on 64bit architectures. + +Signed-off-by: Takashi Iwai +Acked-by: Charles Keepax +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/wm8960.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/codecs/wm8960.c ++++ b/sound/soc/codecs/wm8960.c +@@ -181,7 +181,7 @@ static int wm8960_get_deemph(struct snd_ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); + +- ucontrol->value.enumerated.item[0] = wm8960->deemph; ++ ucontrol->value.integer.value[0] = wm8960->deemph; + return 0; + } + +@@ -190,7 +190,7 @@ static int wm8960_put_deemph(struct snd_ + { + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); +- int deemph = ucontrol->value.enumerated.item[0]; ++ int deemph = ucontrol->value.integer.value[0]; + + if (deemph > 1) + return -EINVAL; diff --git a/queue-3.10/series b/queue-3.10/series index ca0bcc4503c..637e86343a3 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,2 +1,11 @@ asoc-sgtl5000-remove-useless-register-write-clearing-chrgpump_powerup.patch asoc-cs4271-fix-wrong-value-references-for-boolean-kctl.patch +asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch +asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch +asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch +asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch +asoc-wm8903-fix-wrong-value-references-for-boolean-kctl.patch +asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch +asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch +asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch +asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch