UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (7274): dabusb: fix shadowed variable warning in dabusb.c 

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>
This commit is contained in:
Harvey Harrison 2008-04-22 14:45:32 -03:00 committed by Mauro Carvalho Chehab
parent 1744a7770c
commit 6f2896756c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/video/dabusb.c
View File

@ -205,7 +205,7 @@ static void dabusb_iso_complete (struct urb *purb)
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
static int dabusb_alloc_buffers (pdabusb_t s) static int dabusb_alloc_buffers (pdabusb_t s)
{ {
int buffers = 0; int transfer_len = 0;
pbuff_t b; pbuff_t b;
unsigned int pipe = usb_rcvisocpipe (s->usbdev, _DABUSB_ISOPIPE); unsigned int pipe = usb_rcvisocpipe (s->usbdev, _DABUSB_ISOPIPE);
int pipesize = usb_maxpacket (s->usbdev, pipe, usb_pipeout (pipe)); 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", dbg("dabusb_alloc_buffers pipesize:%d packets:%d transfer_buffer_len:%d",
pipesize, packets, transfer_buffer_length); 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); b = kzalloc(sizeof (buff_t), GFP_KERNEL);
if (!b) { if (!b) {
err("kzalloc(sizeof(buff_t))==NULL"); 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; 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); list_add_tail (&b->buff_list, &s->free_buff_list);
} }
s->got_mem = buffers; s->got_mem = transfer_len;
return 0; return 0;