From a2f2058e3d295fbaa5f681c1651cb5a8df840966 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 24 Jul 2018 19:11:25 +0200 Subject: video: fbdev: pxafb: handle errors from pxafb_init_fbinfo() correctly pxafb_init_fbinfo() can not only report errors caused by failed allocations but also when the clock can't be found. To fix this, return an error pointer instead of NULL in case of errors, and up-chain the result. Signed-off-by: Daniel Mack Reviewed-by: Robert Jarzmik Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/video/fbdev/pxafb.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/video/fbdev/pxafb.c') diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c index 6f3a93b3097c..68459b07d442 100644 --- a/drivers/video/fbdev/pxafb.c +++ b/drivers/video/fbdev/pxafb.c @@ -1802,14 +1802,14 @@ static struct pxafb_info *pxafb_init_fbinfo(struct device *dev, fbi = devm_kzalloc(dev, sizeof(struct pxafb_info) + sizeof(u32) * 16, GFP_KERNEL); if (!fbi) - return NULL; + return ERR_PTR(-ENOMEM); fbi->dev = dev; fbi->inf = inf; fbi->clk = devm_clk_get(dev, NULL); if (IS_ERR(fbi->clk)) - return NULL; + return ERR_CAST(fbi->clk); strcpy(fbi->fb.fix.id, PXA_NAME); @@ -2287,10 +2287,9 @@ static int pxafb_probe(struct platform_device *dev) } fbi = pxafb_init_fbinfo(&dev->dev, inf); - if (!fbi) { - /* only reason for pxafb_init_fbinfo to fail is kmalloc */ + if (IS_ERR(fbi)) { dev_err(&dev->dev, "Failed to initialize framebuffer device\n"); - ret = -ENOMEM; + ret = PTR_ERR(fbi); goto failed; } -- cgit v1.2.3