Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331080
b: refs/heads/master
c: 18ad896
h: refs/heads/master
v: v3
  • Loading branch information
Ezequiel Garcia authored and Mauro Carvalho Chehab committed Sep 25, 2012
1 parent 49f822b commit 6e7cc41
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83c735379b41a8c07af6a81140e071e87b95dd11
refs/heads/master: 18ad89659a345c017ab61f758f9dfedab3c8190f
14 changes: 7 additions & 7 deletions trunk/drivers/media/usb/stk1160/stk1160-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,18 +342,18 @@ static void stk1160_isoc_irq(struct urb *urb)
*/
void stk1160_cancel_isoc(struct stk1160 *dev)
{
int i;
int i, num_bufs = dev->isoc_ctl.num_bufs;

/*
* This check is not necessary, but we add it
* to avoid a spurious debug message
*/
if (!dev->isoc_ctl.num_bufs)
if (!num_bufs)
return;

stk1160_dbg("killing urbs...\n");
stk1160_dbg("killing %d urbs...\n", num_bufs);

for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
for (i = 0; i < num_bufs; i++) {

/*
* To kill urbs we can't be in atomic context.
Expand All @@ -373,11 +373,11 @@ void stk1160_cancel_isoc(struct stk1160 *dev)
void stk1160_free_isoc(struct stk1160 *dev)
{
struct urb *urb;
int i;
int i, num_bufs = dev->isoc_ctl.num_bufs;

stk1160_dbg("freeing urb buffers...\n");
stk1160_dbg("freeing %d urb buffers...\n", num_bufs);

for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
for (i = 0; i < num_bufs; i++) {

urb = dev->isoc_ctl.urb[i];
if (urb) {
Expand Down

0 comments on commit 6e7cc41

Please sign in to comment.