diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 06:54:23 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 06:54:23 +0000 |
commit | 9b3749d68b5eb12fe8ef2fc299888b8338bd3367 (patch) | |
tree | a769150632c144f808a1abd79bf5c8c270bed3c3 /linux/drivers/media/video/dabusb.c | |
parent | 34b6d0f27a85c39312f5c81ad3479e30f21f0ce1 (diff) | |
download | mediapointer-dvb-s2-9b3749d68b5eb12fe8ef2fc299888b8338bd3367.tar.gz mediapointer-dvb-s2-9b3749d68b5eb12fe8ef2fc299888b8338bd3367.tar.bz2 |
dabusb: fix shadowed variable warning in dabusb.c
From: Harvey Harrison <harvey.harrison@gmail.com>
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>
Diffstat (limited to 'linux/drivers/media/video/dabusb.c')
-rw-r--r-- | linux/drivers/media/video/dabusb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/dabusb.c b/linux/drivers/media/video/dabusb.c index 8d034ca2b..7f69d4043 100644 --- a/linux/drivers/media/video/dabusb.c +++ b/linux/drivers/media/video/dabusb.c @@ -212,7 +212,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)); @@ -223,7 +223,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"); @@ -258,10 +258,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; |