diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /drivers/net/usb/rtl8150.c | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/net/usb/rtl8150.c')
| -rw-r--r-- | drivers/net/usb/rtl8150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 7e1f00131f91..df56a518691c 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c | |||
| @@ -376,7 +376,7 @@ static int alloc_all_urbs(rtl8150_t * dev) | |||
| 376 | return 0; | 376 | return 0; |
| 377 | } | 377 | } |
| 378 | dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL); | 378 | dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL); |
| 379 | if (!dev->intr_urb) { | 379 | if (!dev->ctrl_urb) { |
| 380 | usb_free_urb(dev->rx_urb); | 380 | usb_free_urb(dev->rx_urb); |
| 381 | usb_free_urb(dev->tx_urb); | 381 | usb_free_urb(dev->tx_urb); |
| 382 | usb_free_urb(dev->intr_urb); | 382 | usb_free_urb(dev->intr_urb); |