From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 11 Aug 2011 01:43:40 +0000 (+0900)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4158a057413c8a6ee1c0fc49b8679bcdb2b5b32d;p=linux-beck.git

Merge branch 'for-3.1' into for-3.2
---

4158a057413c8a6ee1c0fc49b8679bcdb2b5b32d
diff --cc sound/soc/codecs/wm8994.c
index fb5c96163610,b393f9fac97a..4487c5e6ad89
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -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;