diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-08-29 09:46:30 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-08-29 09:46:30 +0200 |
| commit | 6ad30ce046aefbdc3848232c665a728860d7bb68 (patch) | |
| tree | 34af8fc78b28281fcfe531a26401b440c078038e /drivers/of/irq.c | |
| parent | pinctrl: rockchip: Implement .request() and .free() callbacks (diff) | |
| parent | Linux 3.11-rc7 (diff) | |
| download | linux-6ad30ce046aefbdc3848232c665a728860d7bb68.tar.xz linux-6ad30ce046aefbdc3848232c665a728860d7bb68.zip | |
Merge tag 'v3.11-rc7' into devel
Merged in this to avoid conflicts with the big locking fixes
from upstream.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Conflicts:
drivers/pinctrl/pinctrl-sunxi.c
Diffstat (limited to 'drivers/of/irq.c')
| -rw-r--r-- | drivers/of/irq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index a3c1c5aae6a9..1264923ade0f 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -345,6 +345,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) if (r && irq) { const char *name = NULL; + memset(r, 0, sizeof(*r)); /* * Get optional "interrupts-names" property to add a name * to the resource. @@ -482,8 +483,9 @@ void __init of_irq_init(const struct of_device_id *matches) } /* Get the next pending parent that might have children */ - desc = list_first_entry(&intc_parent_list, typeof(*desc), list); - if (list_empty(&intc_parent_list) || !desc) { + desc = list_first_entry_or_null(&intc_parent_list, + typeof(*desc), list); + if (!desc) { pr_err("of_irq_init: children remain, but no parents\n"); break; } |