Fixed dereference before null check.

Signed-off-by: Tracy Yi <tracy-yi@ti.com>

1 files changed, 19 insertions, 2 deletions

diff --git a/tas2562-codec.c b/tas2562-codec.c
index 0ba978a..565c458 100644
--- a/tas2562-codec.c
+++ b/tas2562-codec.c
@@ -128,7 +128,7 @@ static int tas2562iv_put(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
-        struct tas2562_priv *p_tas2562 = snd_soc_codec_get_drvdata(codec);
+        struct tas2562_priv *p_tas2562 = NULL;
         int iv_enable = 0, n_result = 0;
 
         if (codec == NULL) {
@@ -136,6 +136,12 @@ static int tas2562iv_put(struct snd_kcontrol *kcontrol,
                 return 0;
         }
 
+        p_tas2562 = snd_soc_codec_get_drvdata(codec);
+        if (p_tas2562 == NULL) {
+                pr_err("%s:p_tas2562 is NULL\n", __func__);
+                return 0;
+        }
+
         iv_enable = ucontrol->value.integer.value[0];
 
         n_result = tas2562_iv_enable(p_tas2562, iv_enable);
@@ -149,9 +155,20 @@ static int tas2562iv_get(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
-        struct tas2562_priv *p_tas2562 = snd_soc_codec_get_drvdata(codec);
+        struct tas2562_priv *p_tas2562 = NULL;
         int ret, value;
 
+        if (codec == NULL) {
+                pr_err("%s:codec is NULL\n", __func__);
+                return 0;
+        }
+
+        p_tas2562 = snd_soc_codec_get_drvdata(codec);
+        if (p_tas2562 == NULL) {
+                pr_err("%s:p_tas2562 is NULL\n", __func__);
+                return 0;
+        }
+
         ret = p_tas2562->read(p_tas2562, channel_left,
                         TAS2562_POWERCONTROL, &value);
         if (ret < 0)