]> err.no Git - linux-2.6/commitdiff
V4L/DVB (7274): dabusb: fix shadowed variable warning in dabusb.c
authorHarvey Harrison <harvey.harrison@gmail.com>
Tue, 22 Apr 2008 17:45:32 +0000 (14:45 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Thu, 24 Apr 2008 17:07:46 +0000 (14:07 -0300)
drivers/media/video/dabusb.c:208:6: warning: symbol 'buffers' shadows an earlier one
drivers/media/video/dabusb.c:63:12: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/dabusb.c

index a5731f90be0f842d39aa1a941c50d0ab31d3f6e9..8d1f8ee2a533a48ea3e793b11399873e9d00cd6b 100644 (file)
@@ -205,7 +205,7 @@ static void dabusb_iso_complete (struct urb *purb)
 /*-------------------------------------------------------------------*/
 static int dabusb_alloc_buffers (pdabusb_t s)
 {
-       int buffers = 0;
+       int transfer_len = 0;
        pbuff_t b;
        unsigned int pipe = usb_rcvisocpipe (s->usbdev, _DABUSB_ISOPIPE);
        int pipesize = usb_maxpacket (s->usbdev, pipe, usb_pipeout (pipe));
@@ -216,7 +216,7 @@ static int dabusb_alloc_buffers (pdabusb_t s)
        dbg("dabusb_alloc_buffers pipesize:%d packets:%d transfer_buffer_len:%d",
                 pipesize, packets, transfer_buffer_length);
 
-       while (buffers < (s->total_buffer_size << 10)) {
+       while (transfer_len < (s->total_buffer_size << 10)) {
                b = kzalloc(sizeof (buff_t), GFP_KERNEL);
                if (!b) {
                        err("kzalloc(sizeof(buff_t))==NULL");
@@ -251,10 +251,10 @@ static int dabusb_alloc_buffers (pdabusb_t s)
                        b->purb->iso_frame_desc[i].length = pipesize;
                }
 
-               buffers += transfer_buffer_length;
+               transfer_len += transfer_buffer_length;
                list_add_tail (&b->buff_list, &s->free_buff_list);
        }
-       s->got_mem = buffers;
+       s->got_mem = transfer_len;
 
        return 0;