diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-22 13:45:32 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:46 -0400 |
commit | 6f2896756c4f1d4df5bd30599e6444c9513cfe8d (patch) | |
tree | 6ea769ce7c6f907befafc11253efe026f9a7cf3c | |
parent | 1744a7770c27a709c464ce51617c2b31721db165 (diff) |
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>
-rw-r--r-- | drivers/media/video/dabusb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index a5731f90be0f..8d1f8ee2a533 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -205,7 +205,7 @@ static void dabusb_iso_complete (struct urb *purb) | |||
205 | /*-------------------------------------------------------------------*/ | 205 | /*-------------------------------------------------------------------*/ |
206 | static int dabusb_alloc_buffers (pdabusb_t s) | 206 | static int dabusb_alloc_buffers (pdabusb_t s) |
207 | { | 207 | { |
208 | int buffers = 0; | 208 | int transfer_len = 0; |
209 | pbuff_t b; | 209 | pbuff_t b; |
210 | unsigned int pipe = usb_rcvisocpipe (s->usbdev, _DABUSB_ISOPIPE); | 210 | unsigned int pipe = usb_rcvisocpipe (s->usbdev, _DABUSB_ISOPIPE); |
211 | int pipesize = usb_maxpacket (s->usbdev, pipe, usb_pipeout (pipe)); | 211 | int pipesize = usb_maxpacket (s->usbdev, pipe, usb_pipeout (pipe)); |
@@ -216,7 +216,7 @@ static int dabusb_alloc_buffers (pdabusb_t s) | |||
216 | dbg("dabusb_alloc_buffers pipesize:%d packets:%d transfer_buffer_len:%d", | 216 | dbg("dabusb_alloc_buffers pipesize:%d packets:%d transfer_buffer_len:%d", |
217 | pipesize, packets, transfer_buffer_length); | 217 | pipesize, packets, transfer_buffer_length); |
218 | 218 | ||
219 | while (buffers < (s->total_buffer_size << 10)) { | 219 | while (transfer_len < (s->total_buffer_size << 10)) { |
220 | b = kzalloc(sizeof (buff_t), GFP_KERNEL); | 220 | b = kzalloc(sizeof (buff_t), GFP_KERNEL); |
221 | if (!b) { | 221 | if (!b) { |
222 | err("kzalloc(sizeof(buff_t))==NULL"); | 222 | err("kzalloc(sizeof(buff_t))==NULL"); |
@@ -251,10 +251,10 @@ static int dabusb_alloc_buffers (pdabusb_t s) | |||
251 | b->purb->iso_frame_desc[i].length = pipesize; | 251 | b->purb->iso_frame_desc[i].length = pipesize; |
252 | } | 252 | } |
253 | 253 | ||
254 | buffers += transfer_buffer_length; | 254 | transfer_len += transfer_buffer_length; |
255 | list_add_tail (&b->buff_list, &s->free_buff_list); | 255 | list_add_tail (&b->buff_list, &s->free_buff_list); |
256 | } | 256 | } |
257 | s->got_mem = buffers; | 257 | s->got_mem = transfer_len; |
258 | 258 | ||
259 | return 0; | 259 | return 0; |
260 | 260 | ||