]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
V4L/DVB (13954): Correct NULL test
authorJulia Lawall <julia@diku.dk>
Mon, 28 Dec 2009 14:09:55 +0000 (11:09 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 26 Feb 2010 18:10:33 +0000 (15:10 -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>
@r@
identifier f;
@@

f(...) { <+... return NULL; ...+> }

@@
expression *x;
expression y;
identifier r.f;
statement S;
@@

x = f(...);
(
if ((x) == NULL) S
|
if (
-   y
+   x
       == NULL)
 S
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/usbvision/usbvision-video.c

index 1054546db9080a7445e74b2d3ef23f790fc5372c..7c17ec63c5da1a3bc1f6902e48ded0b64e235ab6 100644 (file)
@@ -1487,7 +1487,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
                usbvision->vbi = usbvision_vdev_init(usbvision,
                                                     &usbvision_vbi_template,
                                                     "USBVision VBI");
-               if (usbvision->vdev == NULL) {
+               if (usbvision->vbi == NULL) {
                        goto err_exit;
                }
                if (video_register_device(usbvision->vbi,