diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 03:21:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 03:21:36 +0100 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /sound/soc/codecs/wm8978.c | |
| parent | misc: apds9802als: Fix the logic checking timeout in als_wait_for_data_ready() (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | linux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.xz linux-98c4514ff6e3072288770db66f91bdb15af8b433.zip | |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'sound/soc/codecs/wm8978.c')
| -rw-r--r-- | sound/soc/codecs/wm8978.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 5421fd9fbcb5..4c0a8e496131 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -782,7 +782,7 @@ static int wm8978_hw_params(struct snd_pcm_substream *substream, wm8978->mclk_idx = -1; f_sel = wm8978->f_mclk; } else { - if (!wm8978->f_pllout) { + if (!wm8978->f_opclk) { /* We only enter here, if OPCLK is not used */ int ret = wm8978_configure_pll(codec); if (ret < 0) |