The patch number 14082 was added via Douglas Schilling Landgraf 
<dougsl...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        Linux Media Mailing List <linux-me...@vger.kernel.org>

------

From: M?rton N?meth  <nm...@freemail.hu>
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

Priority: normal

Signed-off-by: M?rton N?meth <nm...@freemail.hu>
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com>


---

 linux/drivers/media/video/zoran/zoran_device.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -r 7df9b99f0da7 -r a7155123d4a3 
linux/drivers/media/video/zoran/zoran_device.c
--- a/linux/drivers/media/video/zoran/zoran_device.c    Mon Feb 01 15:32:02 
2010 -0200
+++ b/linux/drivers/media/video/zoran/zoran_device.c    Mon Feb 01 15:33:36 
2010 -0200
@@ -1230,7 +1230,7 @@
               u32           astat,
               u32           stat)
 {
-       int i, j;
+       int i;
 
        /* This is JPEG error handling part */
        if (zr->codec_mode != BUZ_MODE_MOTION_COMPRESS &&
@@ -1281,6 +1281,7 @@
        /* 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


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/a7155123d4a3a139fea23ea90fe64991e8109d35

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to