aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2010-01-23 08:44:14 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:49 -0500
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 d68da9f793c..e6ad4b20561 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,
1229 u32 astat, 1229 u32 astat,
1230 u32 stat) 1230 u32 stat)
1231{ 1231{
1232 int i, j; 1232 int i;
1233 1233
1234 /* This is JPEG error handling part */ 1234 /* This is JPEG error handling part */
1235 if (zr->codec_mode != BUZ_MODE_MOTION_COMPRESS && 1235 if (zr->codec_mode != BUZ_MODE_MOTION_COMPRESS &&
@@ -1280,6 +1280,7 @@ error_handler (struct zoran *zr,
1280 /* Report error */ 1280 /* Report error */
1281 if (zr36067_debug > 1 && zr->num_errors <= 8) { 1281 if (zr36067_debug > 1 && zr->num_errors <= 8) {
1282 long frame; 1282 long frame;
1283 int j;
1283 1284
1284 frame = zr->jpg_pend[zr->jpg_dma_tail & BUZ_MASK_FRAME]; 1285 frame = zr->jpg_pend[zr->jpg_dma_tail & BUZ_MASK_FRAME];
1285 printk(KERN_ERR 1286 printk(KERN_ERR