Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Aug 2011 01:43:40 +0000 (10:43 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 11 Aug 2011 01:43:40 +0000 (10:43 +0900)
1  2 
sound/soc/codecs/wm8994.c

index fb5c96163610f4c599c57c90320505c6aaaed88d,b393f9fac97a5e75a8bc1b44cb3c6f898482cad3..4487c5e6ad8927e3d289cc3c6ccc682e34f23f32
@@@ -2980,9 -2978,10 +2980,10 @@@ static int wm8994_codec_probe(struct sn
                        wm8994->hubs.series_startup = 1;
                        break;
                default:
 -                      wm8994->hubs.dcs_readback_mode = 1;
 +                      wm8994->hubs.dcs_readback_mode = 2;
                        break;
                }
+               break;
  
        case WM8958:
                wm8994->hubs.dcs_readback_mode = 1;