Skip to content

L
linux
Commit 51126f60 authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents 66874cc1 f2a5ded3
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
sound/soc/codecs/rt5645.c
View file @ 51126f60
...@@ -2943,6 +2943,9 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645) ...@@ -2943,6 +2943,9 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645)
{ {
int val, btn_type, gpio_state = 0, report = 0; int val, btn_type, gpio_state = 0, report = 0;
if (!rt5645->codec)
return -EINVAL;
switch (rt5645->pdata.jd_mode) { switch (rt5645->pdata.jd_mode) {
case 0: /* Not using rt5645 JD */ case 0: /* Not using rt5645 JD */
if (rt5645->gpiod_hp_det) { if (rt5645->gpiod_hp_det) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7