lkml.org 
[lkml]   [2018]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH -next] irqchip/ompic: fix return value check in ompic_of_init()
On Tue, Jan 02, 2018 at 11:47:19AM +0000, Wei Yongjun wrote:
> In case of error, the function ioremap() returns NULL pointer not
> ERR_PTR(). The IS_ERR() test in the return value check should be
> replaced with NULL test.

Thanks, I am not sure why I was using the *ERR*() macros. 2 questions:

- How did you notice this?
- Should I pull this in through my tree or do you have another route? i.e.
Marc?

> Fixes: 9b54470afd83 ("irqchip: add initial support for ompic")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

Acked-by: Stafford Horne <shorne@gmail.com>

-Stafford

> ---
> drivers/irqchip/irq-ompic.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/irqchip/irq-ompic.c b/drivers/irqchip/irq-ompic.c
> index cf6d0c4..400b119 100644
> --- a/drivers/irqchip/irq-ompic.c
> +++ b/drivers/irqchip/irq-ompic.c
> @@ -171,9 +171,9 @@ static int __init ompic_of_init(struct device_node *node,
>
> /* Setup the device */
> ompic_base = ioremap(res.start, resource_size(&res));
> - if (IS_ERR(ompic_base)) {
> + if (!ompic_base) {
> pr_err("ompic: unable to map registers");
> - return PTR_ERR(ompic_base);
> + return -ENOMEM;
> }
>
> irq = irq_of_parse_and_map(node, 0);
>

\
 
 \ /
  Last update: 2018-01-03 15:42    [W:0.021 / U:6.812 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site