mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 00:32:00 +00:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
This commit is contained in:
commit
12844a8479
@ -636,7 +636,7 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc)
|
||||
if (clk_enable(b->drvdata->pclk)) {
|
||||
dev_err(b->gpio_chip.parent,
|
||||
"unable to enable clock for pending IRQs\n");
|
||||
return;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
@ -652,6 +652,7 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc)
|
||||
if (eintd->nr_banks)
|
||||
clk_disable(eintd->banks[0]->drvdata->pclk);
|
||||
|
||||
out:
|
||||
chained_irq_exit(chip, desc);
|
||||
}
|
||||
|
||||
|
@ -1172,7 +1172,7 @@ static void samsung_banks_node_get(struct device *dev, struct samsung_pinctrl_dr
|
||||
else
|
||||
dev_warn(dev, "Missing node for bank %s - invalid DTB\n",
|
||||
bank->name);
|
||||
/* child reference dropped in samsung_drop_banks_of_node() */
|
||||
/* child reference dropped in samsung_banks_node_put() */
|
||||
}
|
||||
}
|
||||
|
||||
@ -1272,7 +1272,7 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
|
||||
|
||||
ret = platform_get_irq_optional(pdev, 0);
|
||||
if (ret < 0 && ret != -ENXIO)
|
||||
return ret;
|
||||
goto err_put_banks;
|
||||
if (ret > 0)
|
||||
drvdata->irq = ret;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user