aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-01-21 08:02:46 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-21 16:15:31 -0500
commit5c6e9bf011bca072648017477b0fe36402be1415 (patch)
treed185f3c6d26559d40600fc1e6cf711171cee26c6
parentf4cc1834bdc47d0574ceffb728f256f67e1190ef (diff)
drivers/usb/chipidea/core.c: adjust duplicate test
Delete successive tests to the same location. In this case res has already been tested for being NULL, and calling devm_request_and_ioremap will not make it NULL. On the other hand, devm_request_and_ioremap can return NULL on failure. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @s exists@ local idexpression y; expression x,e; @@ *if ( \(x == NULL\|IS_ERR(x)\|y != 0\) ) { ... when forall return ...; } ... when != \(y = e\|y += e\|y -= e\|y |= e\|y &= e\|y++\|y--\|&y\) when != \(XT_GETPAGE(...,y)\|WMI_CMD_BUF(...)\) *if ( \(x == NULL\|IS_ERR(x)\|y != 0\) ) { ... when forall return ...; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/chipidea/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index aebf695a9344..57cae1f897b2 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -411,7 +411,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
411 } 411 }
412 412
413 base = devm_request_and_ioremap(dev, res); 413 base = devm_request_and_ioremap(dev, res);
414 if (!res) { 414 if (!base) {
415 dev_err(dev, "can't request and ioremap resource\n"); 415 dev_err(dev, "can't request and ioremap resource\n");
416 return -ENOMEM; 416 return -ENOMEM;
417 } 417 }