Skip to content

Commit

Permalink
pinctrl: exynos: Correct the detection of wakeup-eint node
Browse files Browse the repository at this point in the history
Current way of finding the wakeup-eint node scans the whole device tree
not only children of the pinctrl node, so it might detect a wakeup-eint
node of another pinctrl device.

This patch limits the scope of looking for nodes only to subnodes of the
pinctrl node.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Tomasz Figa authored and Kukjin Kim committed Sep 20, 2012
1 parent 9759e2e commit c3ad056
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/pinctrl/pinctrl-exynos.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,15 +431,19 @@ static const struct irq_domain_ops exynos_wkup_irqd_ops = {
static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
{
struct device *dev = d->dev;
struct device_node *wkup_np;
struct device_node *wkup_np = NULL;
struct device_node *np;
struct exynos_weint_data *weint_data;
int idx, irq;

wkup_np = of_find_matching_node(dev->of_node, exynos_wkup_irq_ids);
if (!wkup_np) {
dev_err(dev, "wakeup controller node not found\n");
return -ENODEV;
for_each_child_of_node(dev->of_node, np) {
if (of_match_node(exynos_wkup_irq_ids, np)) {
wkup_np = np;
break;
}
}
if (!wkup_np)
return -ENODEV;

d->wkup_irqd = irq_domain_add_linear(wkup_np, d->ctrl->nr_wint,
&exynos_wkup_irqd_ops, d);
Expand Down

0 comments on commit c3ad056

Please sign in to comment.