Merge branch 'for-2.6.40' into for-2.6.41

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 */