提交 dbf07cf0 编写于 作者: M Maxime Ripard 提交者: Thomas Gleixner

irqchip: vf610: Fix of_io_request_and_map error check

of_io_request_and map returns an error pointer, but the current code assumes
that on error the returned pointer will be NULL.

Obviously, that makes the check completely useless. Change the test to actually
check for the proper error code.
Signed-off-by: NMaxime Ripard <maxime.ripard@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1430579006-32702-7-git-send-email-maxime.ripard@free-electrons.comSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
上级 f3110534
...@@ -174,10 +174,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node, ...@@ -174,10 +174,9 @@ static int __init vf610_mscm_ir_of_init(struct device_node *node,
return -ENOMEM; return -ENOMEM;
mscm_ir_data->mscm_ir_base = of_io_request_and_map(node, 0, "mscm-ir"); mscm_ir_data->mscm_ir_base = of_io_request_and_map(node, 0, "mscm-ir");
if (IS_ERR(mscm_ir_data->mscm_ir_base)) {
if (!mscm_ir_data->mscm_ir_base) {
pr_err("vf610_mscm_ir: unable to map mscm register\n"); pr_err("vf610_mscm_ir: unable to map mscm register\n");
ret = -ENOMEM; ret = PTR_ERR(mscm_ir_data->mscm_ir_base);
goto out_free; goto out_free;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册