diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-05-05 23:36:09 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-05-05 23:36:16 +0930 |
| commit | 03ab83cb3ff6dfeebb7a76bd877ba6ac997ecd04 (patch) | |
| tree | 8f7bf3ea0cde1fd2fb76e7e8f1aa534ade235d82 /drivers/irqchip | |
| parent | bba98b65c826efeb83486deb65e36d2d1b25fb08 (diff) | |
| parent | 1a1a512b983108015ced1e7a7c7775cfeec42d8c (diff) | |
| download | talos-obmc-linux-03ab83cb3ff6dfeebb7a76bd877ba6ac997ecd04.tar.gz talos-obmc-linux-03ab83cb3ff6dfeebb7a76bd877ba6ac997ecd04.zip | |
Merge tag 'v4.4.9' into dev-4.4
This is the 4.4.9 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-mxs.c | 2 | ||||
| -rw-r--r-- | drivers/irqchip/irq-sunxi-nmi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index efe50845939d..17304705f2cf 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c @@ -183,7 +183,7 @@ static void __iomem * __init icoll_init_iobase(struct device_node *np) void __iomem *icoll_base; icoll_base = of_io_request_and_map(np, 0, np->name); - if (!icoll_base) + if (IS_ERR(icoll_base)) panic("%s: unable to map resource", np->full_name); return icoll_base; } diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index 4ef178078e5b..1254e98f6b57 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -154,9 +154,9 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node, gc = irq_get_domain_generic_chip(domain, 0); gc->reg_base = of_io_request_and_map(node, 0, of_node_full_name(node)); - if (!gc->reg_base) { + if (IS_ERR(gc->reg_base)) { pr_err("unable to map resource\n"); - ret = -ENOMEM; + ret = PTR_ERR(gc->reg_base); goto fail_irqd_remove; } |
