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

51126f60 · Mark Brown · 66874cc1 · f2a5ded3 · 51126f60
Commit 51126f60 authored Jul 24, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sound/soc/codecs/rt5645.c sound/soc/codecs/rt5645.c +3 -0

No files found.
--- 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) {