ASoC: rt5645: Fix potential crash in jd function
authorBard Liao <bardliao@realtek.com>
Tue, 9 Dec 2014 02:14:45 +0000 (10:14 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 9 Dec 2014 16:10:45 +0000 (16:10 +0000)
If no one defined the rt5645->pdata.hp_det_gpio in coreboot/bios.
It will cause kernel to reboot because rt5645->pdata.hp_det_gpio
is 0. So it is worth to add a check in rt5645_jack_detect.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5645.c

index d16331e0b64d4532647b5f4eb4d4abe58a4d66ec..c901ef6ba69b3f0f541bbb4d5a921a2c85fb3fdb 100644 (file)
@@ -2113,6 +2113,10 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec,
        int gpio_state, jack_type = 0;
        unsigned int val;
 
+       if (!gpio_is_valid(rt5645->pdata.hp_det_gpio)) {
+               dev_err(codec->dev, "invalid gpio\n");
+               return -EINVAL;
+       }
        gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio);
 
        dev_dbg(codec->dev, "gpio = %d(%d)\n", rt5645->pdata.hp_det_gpio,