浏览代码

Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645

Mark Brown 10 年之前
父节点
当前提交
2c23b0c10f
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      sound/soc/codecs/rt5645.c

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

@@ -2927,6 +2927,9 @@ static void rt5645_jack_detect_work(struct work_struct *work)
 		container_of(work, struct rt5645_priv, jack_detect_work.work);
 	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) {