From: Márton Németh Date: Sat, 23 Jan 2010 13:44:14 +0000 (-0300) Subject: V4L/DVB: zoran: remove variable shadowing X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6aba72cf76d21527dc73403e4147397375c8c232;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Mauro Carvalho Chehab --- 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