diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 10:00:47 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 10:00:47 -0400 |
| commit | f928badf5e58195af2ae3a457da35190d10ace48 (patch) | |
| tree | b3cf42e3aa815464a4b2da0508c6b12f246768b0 /sound/soc/codecs/isabelle.c | |
| parent | 9780b68435eea68906bcf8f34c5522b5b087f4be (diff) | |
| parent | ab64246cf8c31f70a390dcabd134097c3aec45ab (diff) | |
Merge remote-tracking branch 'asoc/topic/codecs' into asoc-next
Diffstat (limited to 'sound/soc/codecs/isabelle.c')
| -rw-r--r-- | sound/soc/codecs/isabelle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index 3e264a78017a..3a89ce66d51d 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c | |||
| @@ -918,8 +918,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream, | |||
| 918 | struct snd_pcm_hw_params *params, | 918 | struct snd_pcm_hw_params *params, |
| 919 | struct snd_soc_dai *dai) | 919 | struct snd_soc_dai *dai) |
| 920 | { | 920 | { |
| 921 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 921 | struct snd_soc_codec *codec = dai->codec; |
| 922 | struct snd_soc_codec *codec = rtd->codec; | ||
| 923 | u16 aif = 0; | 922 | u16 aif = 0; |
| 924 | unsigned int fs_val = 0; | 923 | unsigned int fs_val = 0; |
| 925 | 924 | ||