Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

git-mirror · Jul 24, 2015 · 51126f6 · 51126f6
2 parents 66874cc + f2a5ded
commit 51126f6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
@@ -2943,6 +2943,9 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645)
 {
 	int val, btn_type, gpio_state = 0, report = 0;
 
+	if (!rt5645->codec)
+		return -EINVAL;
+
 	switch (rt5645->pdata.jd_mode) {
 	case 0: /* Not using rt5645 JD */
 		if (rt5645->gpiod_hp_det) {