]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
V4L/DVB: drivers/staging/tm6000/tm6000-video.c: correct NULL test
authorJulia Lawall <julia@diku.dk>
Thu, 11 Feb 2010 06:30:30 +0000 (03:30 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 18 May 2010 03:43:58 +0000 (00:43 -0300)
Test the just-allocated value for NULL rather than some other value.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,y;
statement S;
@@

x = \(kmalloc\|kcalloc\|kzalloc\)(...);
(
if ((x) == NULL) S
|
if (
-   y
+   x
       == NULL)
 S
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-video.c

index 217721f2195cfb3251e17559ca23d423263cd2b4..627b0ddfcd18d278aba11f537edb5495b52a647c 100644 (file)
@@ -644,7 +644,7 @@ static int tm6000_prepare_isoc(struct tm6000_core *dev, unsigned int framesize)
 
        dev->isoc_ctl.transfer_buffer = kmalloc(sizeof(void *)*num_bufs,
                                   GFP_KERNEL);
-       if (!dev->isoc_ctl.urb) {
+       if (!dev->isoc_ctl.transfer_buffer) {
                tm6000_err("cannot allocate memory for usbtransfer\n");
                kfree(dev->isoc_ctl.urb);
                return -ENOMEM;