aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorMárton Németh2010-01-23 10:44:14 -0300
committerMauro Carvalho Chehab2010-02-26 15:10:49 -0300
commit6aba72cf76d21527dc73403e4147397375c8c232 (patch)
tree327e4893812f86d8f5bd1e299c8c84e1ca80515c /drivers/media/video/zoran
parentdb1b72650d22b8ac3ce56aa90c4fe1314f1876cb (diff)
V4L/DVB: zoran: remove variable shadowing
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>
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r--drivers/media/video/zoran/zoran_device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index d68da9f793c7..e6ad4b205611 100644
--- a/drivers/media/video/zoran/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -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