diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 02:24:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 02:24:16 -0400 |
| commit | a4083c9271e0a697278e089f2c0b9a95363ada0a (patch) | |
| tree | db82449c18bc1410091d39f29c59d47379dd9ec5 /drivers/net | |
| parent | 4742dc1d7670bd00253d2dfb637d55446dc6ef81 (diff) | |
| parent | 7fdba2f2917da4403044d9ea5d239f9cc0e9693d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: Fix cut-and-paste error in rtl8150.c
USB: ehci: stop vt6212 bus hogging
USB: sierra: add another device id
USB: sierra: dma fixes
USB: add support for Motorola ROKR Z6 cellphone in mass storage mode
USB: isd200: fix memory leak in isd200_get_inquiry_data
USB: pl2303: another product ID
USB: new quirk flag to avoid Set-Interface
USB: fix gadgetfs class request delegation
Diffstat (limited to 'drivers/net')
| -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); |