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

This commit is contained in:
Mark Brown 2015-07-24 16:18:19 +01:00
commit 51126f6049

View File

@ -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) {