]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
authorEric Sesterhenn <snakebyte@gmx.de>
Thu, 30 Nov 2006 04:26:46 +0000 (05:26 +0100)
committerAdrian Bunk <bunk@stusta.de>
Thu, 30 Nov 2006 04:26:46 +0000 (05:26 +0100)
This patch converts a if () BUG(); construct to BUG_ON();
which occupies less space, uses unlikely and is safer when
BUG() is disabled.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
drivers/media/video/pwc/pwc-if.c

index 46c1148308843a4d8ed3e0db02d6f20fd8f73c76..e8db6e58d390167006810e2fc233547527bd5b90 100644 (file)
@@ -1095,8 +1095,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
        PWC_DEBUG_OPEN(">> video_open called(vdev = 0x%p).\n", vdev);
 
        pdev = (struct pwc_device *)vdev->priv;
-       if (pdev == NULL)
-               BUG();
+       BUG_ON(!pdev);
        if (pdev->vopen) {
                PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n");
                return -EBUSY;