Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295101
b: refs/heads/master
c: d3db22e
h: refs/heads/master
i:
  295099: 43d03d1
v: v3
  • Loading branch information
Jean Delvare authored and Mauro Carvalho Chehab committed Mar 19, 2012
1 parent 4307d52 commit fe1bdbc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 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: 3ef76759484832e498cba381aa1b24b90cf36a26
refs/heads/master: d3db22e10bd4997d244beee6feea5fa39b2e5b82
7 changes: 6 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/dib0700_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
deb_info("%s()\n", __func__);
if (d->rc_dev == NULL) {
/* This will occur if disable_rc_polling=1 */
kfree(purb->transfer_buffer);
usb_free_urb(purb);
return;
}
Expand All @@ -687,6 +688,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)

if (purb->status < 0) {
deb_info("discontinuing polling\n");
kfree(purb->transfer_buffer);
usb_free_urb(purb);
return;
}
Expand Down Expand Up @@ -781,8 +783,11 @@ int dib0700_rc_setup(struct dvb_usb_device *d)
dib0700_rc_urb_completion, d);

ret = usb_submit_urb(purb, GFP_ATOMIC);
if (ret)
if (ret) {
err("rc submit urb failed\n");
kfree(purb->transfer_buffer);
usb_free_urb(purb);
}

return ret;
}
Expand Down

0 comments on commit fe1bdbc

Please sign in to comment.