]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
V4L/DVB: zoran: remove variable shadowing
authorMárton Németh <nm127@freemail.hu>
Sat, 23 Jan 2010 13:44:14 +0000 (10:44 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 26 Feb 2010 18:10:49 +0000 (15:10 -0300)
The loop counter j is declared twice in function error_handler().
Remove the redundant declaration.

This will remove the following sparse warning (see "make C=1"):
 * symbol 'j' shadows an earlier one

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/zoran/zoran_device.c

index d68da9f793c7cf024f74782f0eef0a14e6f8ac96..e6ad4b205611d41844c05e690cb0ebfd0abb4ad7 100644 (file)
@@ -1229,7 +1229,7 @@ error_handler (struct zoran *zr,
               u32           astat,
               u32           stat)
 {
-       int i, j;
+       int i;
 
        /* This is JPEG error handling part */
        if (zr->codec_mode != BUZ_MODE_MOTION_COMPRESS &&
@@ -1280,6 +1280,7 @@ error_handler (struct zoran *zr,
        /* Report error */
        if (zr36067_debug > 1 && zr->num_errors <= 8) {
                long frame;
+               int j;
 
                frame = zr->jpg_pend[zr->jpg_dma_tail & BUZ_MASK_FRAME];
                printk(KERN_ERR