From: Julien Brunel <brunel@diku.dk>
Date: Mon, 1 Sep 2008 08:57:27 +0000 (+0200)
Subject: USB: drivers/usb/misc: Use an IS_ERR test rather than a NULL test
X-Git-Tag: v2.6.28-rc1~254^2~76
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bedf0883cbe3015d21aec5ed47ddffb429f6cca7;p=linux-2.6-omap-h63xx.git

USB: drivers/usb/misc: Use an IS_ERR test rather than a NULL test

In case of error, the function backlight_device_register returns an
ERR pointer, but never returns a NULL pointer. So a NULL test that may
come after a call to this function should be strengthened by an IS_ERR
test.

The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@match_bad_null_test@
expression x, E;
statement S1,S2;
@@
x = backlight_device_register(...)
... when != x = E
* if (x != NULL)
S1 else S2
// </smpl>

Signed-off-by: Julien Brunel <brunel@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index a076c24a312..71d672ea122 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -314,7 +314,7 @@ error:
 					pdata->urbdata, pdata->urb->transfer_dma);
 			usb_free_urb(pdata->urb);
 		}
-		if (pdata->bd)
+		if (pdata->bd && !IS_ERR(pdata->bd))
 			backlight_device_unregister(pdata->bd);
 		kfree(pdata->msgdata);
 	}