diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 08:18:25 +0300 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 08:18:25 +0300 |
| commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
| tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /drivers/isdn/hisax/st5481_usb.c | |
| parent | 7301c8d3a05dc52d33598364da7c4eb6ab6357eb (diff) | |
| parent | 811803c5572b296e0031e0099203de90d77c7bcf (diff) | |
| download | linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.tar.xz | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/isdn/hisax/st5481_usb.c')
| -rw-r--r-- | drivers/isdn/hisax/st5481_usb.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c index 89fbeb58485d..b096b64b0253 100644 --- a/drivers/isdn/hisax/st5481_usb.c +++ b/drivers/isdn/hisax/st5481_usb.c @@ -335,14 +335,12 @@ void st5481_release_usb(struct st5481_adapter *adapter) // Stop and free Control and Interrupt URBs usb_kill_urb(ctrl->urb); - if (ctrl->urb->transfer_buffer) - kfree(ctrl->urb->transfer_buffer); + kfree(ctrl->urb->transfer_buffer); usb_free_urb(ctrl->urb); ctrl->urb = NULL; usb_kill_urb(intr->urb); - if (intr->urb->transfer_buffer) - kfree(intr->urb->transfer_buffer); + kfree(intr->urb->transfer_buffer); usb_free_urb(intr->urb); ctrl->urb = NULL; } @@ -457,8 +455,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev, err: for (j = 0; j < 2; j++) { if (urb[j]) { - if (urb[j]->transfer_buffer) - kfree(urb[j]->transfer_buffer); + kfree(urb[j]->transfer_buffer); urb[j]->transfer_buffer = NULL; usb_free_urb(urb[j]); urb[j] = NULL; @@ -473,8 +470,7 @@ void st5481_release_isocpipes(struct urb* urb[2]) for (j = 0; j < 2; j++) { usb_kill_urb(urb[j]); - if (urb[j]->transfer_buffer) - kfree(urb[j]->transfer_buffer); + kfree(urb[j]->transfer_buffer); usb_free_urb(urb[j]); urb[j] = NULL; } |