V4L/DVB: au0828: move dereference below sanity checks
authorDan Carpenter <error27@gmail.com>
Fri, 23 Jul 2010 10:09:20 +0000 (07:09 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 2 Aug 2010 19:43:01 +0000 (16:43 -0300)
This function has sanity checks to make sure that "dev" is non-null.  I
moved the dereference down below the checks.  In the current code "dev"
is never actually null.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/au0828/au0828-video.c

index d97e0a28fb24edc3e4aa785174192afe9de8e4ff..7989a7ba7c4005ecea648bce20f396c198e1ece7 100644 (file)
@@ -441,7 +441,7 @@ static void au0828_copy_vbi(struct au0828_dev *dev,
                              unsigned char *outp, unsigned long len)
 {
        unsigned char *startwrite, *startread;
-       int bytesperline = dev->vbi_width;
+       int bytesperline;
        int i, j = 0;
 
        if (dev == NULL) {
@@ -464,6 +464,8 @@ static void au0828_copy_vbi(struct au0828_dev *dev,
                return;
        }
 
+       bytesperline = dev->vbi_width;
+
        if (dma_q->pos + len > buf->vb.size)
                len = buf->vb.size - dma_q->pos;