From 5ac8b110d544c93c48d86d038ff8b5ea211a61c3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 5 Jun 2015 07:10:48 +0900 Subject: [PATCH] remove asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch from 3.10 and 3.14 --- ...ssing-i2c-bus-when-codec-is-disabled.patch | 34 ------------------- queue-3.10/series | 1 - ...ssing-i2c-bus-when-codec-is-disabled.patch | 34 ------------------- queue-3.14/series | 1 - 4 files changed, 70 deletions(-) delete mode 100644 queue-3.10/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch delete mode 100644 queue-3.14/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch diff --git a/queue-3.10/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch b/queue-3.10/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch deleted file mode 100644 index 6b7c83723e8..00000000000 --- a/queue-3.10/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 810e4425c224af6be67dff68c8832af1b5a11f89 Mon Sep 17 00:00:00 2001 -From: Vasily Khoruzhick -Date: Sun, 3 May 2015 21:11:47 +0300 -Subject: ASoC: uda1380: Avoid accessing i2c bus when codec is disabled - -From: Vasily Khoruzhick - -commit 810e4425c224af6be67dff68c8832af1b5a11f89 upstream. - -set_dai_fmt_both() callback is called from snd_soc_runtime_set_dai_fmt() -which is called from snd_soc_register_card(), but at this time codec -is not powered on yet. Replace direct i2c write with regcache write. - -Fixes: 5f0acedddf533c (ASoC: rx1950_uda1380: Use static DAI format setup) -Fixes: 5cc10b9b77c234 (ASoC: h1940_uda1380: Use static DAI format setup) -Signed-off-by: Vasily Khoruzhick -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - sound/soc/codecs/uda1380.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/sound/soc/codecs/uda1380.c -+++ b/sound/soc/codecs/uda1380.c -@@ -435,7 +435,7 @@ static int uda1380_set_dai_fmt_both(stru - if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) - return -EINVAL; - -- uda1380_write(codec, UDA1380_IFACE, iface); -+ uda1380_write_reg_cache(codec, UDA1380_IFACE, iface); - - return 0; - } diff --git a/queue-3.10/series b/queue-3.10/series index 57ad6469198..2e2418ba44c 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -15,7 +15,6 @@ d_walk-might-skip-too-much.patch alsa-hda-add-conexant-codecs-cx20721-cx20722-cx20723-and-cx20724.patch alsa-hda-add-headphone-quirk-for-lifebook-e752.patch asoc-mc13783-fix-wrong-mask-value-used-in-mc13xxx_reg_rmw-calls.patch -asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch asoc-wm8960-fix-rinput3-audio-route-error.patch asoc-wm8994-correct-bclk-div-348-to-384.patch target-pscsi-don-t-leak-scsi_host-if-hba-is-virtual_host.patch diff --git a/queue-3.14/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch b/queue-3.14/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch deleted file mode 100644 index 6b7c83723e8..00000000000 --- a/queue-3.14/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 810e4425c224af6be67dff68c8832af1b5a11f89 Mon Sep 17 00:00:00 2001 -From: Vasily Khoruzhick -Date: Sun, 3 May 2015 21:11:47 +0300 -Subject: ASoC: uda1380: Avoid accessing i2c bus when codec is disabled - -From: Vasily Khoruzhick - -commit 810e4425c224af6be67dff68c8832af1b5a11f89 upstream. - -set_dai_fmt_both() callback is called from snd_soc_runtime_set_dai_fmt() -which is called from snd_soc_register_card(), but at this time codec -is not powered on yet. Replace direct i2c write with regcache write. - -Fixes: 5f0acedddf533c (ASoC: rx1950_uda1380: Use static DAI format setup) -Fixes: 5cc10b9b77c234 (ASoC: h1940_uda1380: Use static DAI format setup) -Signed-off-by: Vasily Khoruzhick -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman - ---- - sound/soc/codecs/uda1380.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/sound/soc/codecs/uda1380.c -+++ b/sound/soc/codecs/uda1380.c -@@ -435,7 +435,7 @@ static int uda1380_set_dai_fmt_both(stru - if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) - return -EINVAL; - -- uda1380_write(codec, UDA1380_IFACE, iface); -+ uda1380_write_reg_cache(codec, UDA1380_IFACE, iface); - - return 0; - } diff --git a/queue-3.14/series b/queue-3.14/series index 17ba4284c93..ce81939d359 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -18,7 +18,6 @@ alsa-hda-add-conexant-codecs-cx20721-cx20722-cx20723-and-cx20724.patch alsa-hda-add-headphone-quirk-for-lifebook-e752.patch revert-alsa-hda-add-mute-led-mode-control-to-thinkpad.patch asoc-mc13783-fix-wrong-mask-value-used-in-mc13xxx_reg_rmw-calls.patch -asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch asoc-wm8960-fix-rinput3-audio-route-error.patch asoc-wm8994-correct-bclk-div-348-to-384.patch staging-gdm724x-correction-of-variable-usage-after-applying-align.patch -- 2.47.3