kernel: update 3.18 to 3.18.14

[openwrt.git] / target / linux / xburst / patches-3.18 / 004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch

diff --git a/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch b/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch
index 3de6ee0..f2c26ad 100644 (file)
--- a/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch
+++ b/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch
@@ -10,11 +10,9 @@ which (I hope) will be done eventually.
  sound/soc/codecs/jz4740.c |    9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
-index df7c01c..6939444 100644
 --- a/sound/soc/codecs/jz4740.c
 +++ b/sound/soc/codecs/jz4740.c
-@@ -249,12 +249,15 @@ static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec,
+@@ -249,12 +249,15 @@ static int jz4740_codec_set_bias_level(s
        case SND_SOC_BIAS_ON:
                break;
        case SND_SOC_BIAS_PREPARE:
@@ -33,6 +31,3 @@ index df7c01c..6939444 100644
                break;
        case SND_SOC_BIAS_STANDBY:
                /* The only way to clear the suspend flag is to reset the codec */
--- 
-1.7.10.4
-