Magellan Linux

Annotation of /trunk/kernel-magellan/patches-3.2/0103-3.2.4-all-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1644 - (hide annotations) (download)
Thu Feb 16 12:24:52 2012 UTC (12 years, 3 months ago) by niro
File size: 1045 byte(s)
-3.2.6-magellan-r1
1 niro 1644 diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
2     index d0beeec..42d9039 100644
3     --- a/sound/soc/codecs/wm5100.c
4     +++ b/sound/soc/codecs/wm5100.c
5     @@ -1379,7 +1379,6 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
6    
7     switch (wm5100->rev) {
8     case 0:
9     - regcache_cache_bypass(wm5100->regmap, true);
10     snd_soc_write(codec, 0x11, 0x3);
11     snd_soc_write(codec, 0x203, 0xc);
12     snd_soc_write(codec, 0x206, 0);
13     @@ -1395,7 +1394,6 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
14     snd_soc_write(codec,
15     wm5100_reva_patches[i].reg,
16     wm5100_reva_patches[i].val);
17     - regcache_cache_bypass(wm5100->regmap, false);
18     break;
19     default:
20     break;
21     @@ -1406,7 +1404,6 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
22     break;
23    
24     case SND_SOC_BIAS_OFF:
25     - regcache_cache_only(wm5100->regmap, true);
26     if (wm5100->pdata.ldo_ena)
27     gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0);
28     regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies),