diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-30 10:54:18 +0800 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-30 10:54:18 +0800 |
commit | d21685ec258f803d3badae5eae821383a34815a9 (patch) | |
tree | 7ab60a2a5d557a4f345b01a79ca2f877c06d9b92 /sound/soc/codecs/max98095.c | |
parent | 74ab24af4fe165de5af01d0507250dd099f096b0 (diff) | |
parent | ea02c63d57d7ec099f66ddb2942b4022e865cd5f (diff) | |
download | linux-d21685ec258f803d3badae5eae821383a34815a9.tar.bz2 |
Merge branch 'for-2.6.40' into for-2.6.41
Diffstat (limited to 'sound/soc/codecs/max98095.c')
-rw-r--r-- | sound/soc/codecs/max98095.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index fe19677bf4b5..872a5fa4bf1f 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -1870,16 +1870,14 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, BUG_ON(channel > 1); - cdata = &max98095->dai[channel]; + if (!pdata || !max98095->eq_textcnt) + return 0; if (sel >= pdata->eq_cfgcnt) return -EINVAL; + cdata = &max98095->dai[channel]; cdata->eq_sel = sel; - - if (!pdata || !max98095->eq_textcnt) - return 0; - fs = cdata->rate; /* Find the selected configuration with nearest sample rate */ @@ -2018,16 +2016,14 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol, BUG_ON(channel > 1); - cdata = &max98095->dai[channel]; + if (!pdata || !max98095->bq_textcnt) + return 0; if (sel >= pdata->bq_cfgcnt) return -EINVAL; + cdata = &max98095->dai[channel]; cdata->bq_sel = sel; - - if (!pdata || !max98095->bq_textcnt) - return 0; - fs = cdata->rate; /* Find the selected configuration with nearest sample rate */ |