[<prev] [next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.0905200916280.12274@pc-004.diku.dk>
Date: Wed, 20 May 2009 09:17:11 +0200 (CEST)
From: Julia Lawall <julia@...u.dk>
To: gregkh@...e.de, haas@...-wuensche.com,
linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org
Subject: [PATCH] drivers/staging/cpc-usb: Adjust NULL test
From: Julia Lawall <julia@...u.dk>
Since card must already be non-NULL, it seems that what was intended
was to test the result of kmalloc.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression E,E1;
identifier f,fld,fld1;
statement S1,S2;
@@
E->fld = f(...);
... when != E = E1
when != E->fld1 = E1
if (
- E
+ E->fld
== NULL) S1 else S2
// </smpl>
Signed-off-by: Julia Lawall <julia@...u.dk>
---
drivers/staging/cpc-usb/cpc-usb_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -u -p a/drivers/staging/cpc-usb/cpc-usb_drv.c b/drivers/staging/cpc-usb/cpc-usb_drv.c
--- a/drivers/staging/cpc-usb/cpc-usb_drv.c
+++ b/drivers/staging/cpc-usb/cpc-usb_drv.c
@@ -899,7 +899,7 @@ static int cpcusb_probe(struct usb_inter
/* allocate and initialize the channel struct */
card->chan = kmalloc(sizeof(CPC_CHAN_T), GFP_KERNEL);
- if (!card) {
+ if (!card->chan) {
kfree(card);
err("Out of memory");
return -ENOMEM;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists