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/firmware/socfpga.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/firmware') diff --git a/drivers/firmware/socfpga.c b/drivers/firmware/socfpga.c index 159644bbfb..79c63eb77c 100644 --- a/drivers/firmware/socfpga.c +++ b/drivers/firmware/socfpga.c @@ -408,14 +408,14 @@ static int fpgamgr_probe(struct device_d *dev) fh = &mgr->fh; mgr->regs = dev_request_mem_region(dev, 0); - if (!mgr->regs) { - ret = -EBUSY; + if (IS_ERR(mgr->regs)) { + ret = PTR_ERR(mgr->regs); goto out; } mgr->regs_data = dev_request_mem_region(dev, 1); - if (!mgr->regs_data) { - ret = -EBUSY; + if (IS_ERR(mgr->regs_data)) { + ret = PTR_ERR(mgr->regs_data); goto out; } -- cgit v1.2.3