Skip to contentSkip to conversation

Patch "ASoC: uda1380: Avoid accessing i2c bus when codec is disabled" has been added to the 3.10-stable tree

PATCH [email protected] 2 participants 3 messages Jun 3, 2015 – Jun 4, 2015

Subsystems (3)
Stable branch Sound ASoC
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ASoC: uda1380: Avoid accessing i2c bus when codec is disabled

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 810e4425c224af6be67dff68c8832af1b5a11f89 Mon Sep 17 00:00:00 2001

From: Vasily Khoruzhick <[email protected]>
Date: Sun, 3 May 2015 21:11:47 +0300
Subject: ASoC: uda1380: Avoid accessing i2c bus when codec is disabled

From: Vasily Khoruzhick <[email protected]>

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 <[email protected]>
Signed-off-by Mark Brown <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 sound/soc/codecs/uda1380.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/uda1380.c +1 -1
@@ -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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch

#1 lore raw
Quoted 8 lines · Greg Kroah-Hartman

This is a note to let you know that I've just added the patch titled

ASoC: uda1380: Avoid accessing i2c bus when codec is disabled

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Quoted 7 lines

The filename of the patch is:
asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

I'm not sure this should be applied to 3.10 (or even 3.14) as the 'Fixes:' commits are not present on these kernels.

Cheers,
--
Lu�s

Quoted 44 lines

From 810e4425c224af6be67dff68c8832af1b5a11f89 Mon Sep 17 00:00:00 2001
From: Vasily Khoruzhick <[email protected]>
Date: Sun, 3 May 2015 21:11:47 +0300
Subject: ASoC: uda1380: Avoid accessing i2c bus when codec is disabled

From: Vasily Khoruzhick <[email protected]>

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 <[email protected]>
Signed-off-by Mark Brown <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 sound/soc/codecs/uda1380.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/uda1380.c +1 -1
@@ -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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch --
To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#2 lore raw
Quoted 13 lines · Luis Henriques
Quoted 12 lines · Greg Kroah-Hartman

This is a note to let you know that I've just added the patch titled

ASoC: uda1380: Avoid accessing i2c bus when codec is disabled

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
asoc-uda1380-avoid-accessing-i2c-bus-when-codec-is-disabled.patch
and it can be found in the queue-3.10 subdirectory.

Quoted 6 lines
Quoted 3 lines

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

I'm not sure this should be applied to 3.10 (or even 3.14) as the 'Fixes:' commits are not present on these kernels.

Good catch, thanks, now removed.

greg k-h