| Message ID | 1471051586-26189-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Aug 13, 2016 at 3:26 AM, Wei Yongjun <weiyj.lk@gmail.com> wrote: > In case of error, the function syscon_node_to_regmap() returns ERR_PTR() > and never returns NULL. The NULL test in the return value check should > be replaced with IS_ERR(). > > Fixes: 25348160e9a4 ("video: ARM CLCD: add special panel hook for Versatiles") > Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Thanks for fixing my stupid mistake Wei! Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 13/08/16 04:26, Wei Yongjun wrote: > In case of error, the function syscon_node_to_regmap() returns ERR_PTR() > and never returns NULL. The NULL test in the return value check should > be replaced with IS_ERR(). > > Fixes: 25348160e9a4 ("video: ARM CLCD: add special panel hook for Versatiles") > Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> > --- > drivers/video/fbdev/amba-clcd-versatile.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c > index 9a90817..56161f9 100644 > --- a/drivers/video/fbdev/amba-clcd-versatile.c > +++ b/drivers/video/fbdev/amba-clcd-versatile.c > @@ -528,9 +528,9 @@ int versatile_clcd_init_panel(struct clcd_fb *fb, > versatile_clcd_type = (enum versatile_clcd)clcd_id->data; > > map = syscon_node_to_regmap(np); > - if (!map) { > + if (IS_ERR(map)) { > dev_err(dev, "no Versatile syscon regmap\n"); > - return -ENODEV; > + return PTR_ERR(map); > } > > switch (versatile_clcd_type) { > Thanks, queued for v4.9. Tomi
diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c index 9a90817..56161f9 100644 --- a/drivers/video/fbdev/amba-clcd-versatile.c +++ b/drivers/video/fbdev/amba-clcd-versatile.c @@ -528,9 +528,9 @@ int versatile_clcd_init_panel(struct clcd_fb *fb, versatile_clcd_type = (enum versatile_clcd)clcd_id->data; map = syscon_node_to_regmap(np); - if (!map) { + if (IS_ERR(map)) { dev_err(dev, "no Versatile syscon regmap\n"); - return -ENODEV; + return PTR_ERR(map); } switch (versatile_clcd_type) {
In case of error, the function syscon_node_to_regmap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 25348160e9a4 ("video: ARM CLCD: add special panel hook for Versatiles") Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> --- drivers/video/fbdev/amba-clcd-versatile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html