From 8ee5479a28df0a3f3019419e46e9ee5c119a27bd Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 19 Feb 2016 09:18:43 +0100 Subject: driver: Fix return check of dev_request_mem_region dev_request_mem_region returns an ERR_PTR, fix places which check for a NULL pointer instead. This patch has been generated with this semantic patch, written by me and improved by Andrey Smirnov: // @@ expression e; expression e1; @@ e = dev_request_mem_region(...); ... -if (!e) - return e1; +if (IS_ERR(e)) + return PTR_ERR(e); @ rule1 @ expression e; @@ e = dev_request_mem_region(...); @@ expression rule1.e; identifier ret, label; constant errno; @@ if (!e) { ... ( - ret = -errno; + ret = PTR_ERR(e); ... goto label; | - return -errno; + return PTR_ERR(e); ) } @depends on rule1@ expression rule1.e; @@ - if (e == NULL) + if (IS_ERR(e)) { ... } // Signed-off-by: Sascha Hauer Signed-off-by: Andrey Smirnov --- drivers/mtd/nand/nand_imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/mtd/nand/nand_imx.c') diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index 00c05d00af..6cabae06a9 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -1168,9 +1168,9 @@ static int __init imxnd_probe(struct device_d *dev) host->base = dev_request_mem_region(dev, 1); host->main_area0 = host->base; - if (!host->regs_ip) { + if (IS_ERR(host->regs_ip)) { dev_err(dev, "no second mem region\n"); - err = -ENODEV; + err = PTR_ERR(host->regs_ip); goto escan; } -- cgit v1.2.3