Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[pandora-kernel.git] / drivers / pinctrl / pinctrl-exynos.c

diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c
index 49ef5a2..21362f4 100644 (file)
--- a/drivers/pinctrl/pinctrl-exynos.c
+++ b/drivers/pinctrl/pinctrl-exynos.c
@@ -431,19 +431,23 @@ 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);
-       if (!d->gpio_irqd) {
+       if (!d->wkup_irqd) {
                dev_err(dev, "wakeup irq domain allocation failed\n");
                return -ENXIO;
        }