Commit 4158a057 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents f024d9a0 280ec8b7

sound/soc/codecs/wm8994.c

+1 −0
Original line number Diff line number Diff line
@@ -2983,6 +2983,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
			wm8994->hubs.dcs_readback_mode = 2;

			break;

		}

		break;



	case WM8958:

		wm8994->hubs.dcs_readback_mode = 1;