diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/net/net1080.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/net/net1080.c')
| -rw-r--r-- | drivers/usb/net/net1080.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c index 301baa72bac7..ce00de8f13a1 100644 --- a/drivers/usb/net/net1080.c +++ b/drivers/usb/net/net1080.c | |||
| @@ -368,7 +368,7 @@ static int net1080_check_connect(struct usbnet *dev) | |||
| 368 | return 0; | 368 | return 0; |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | static void nc_flush_complete(struct urb *urb, struct pt_regs *regs) | 371 | static void nc_flush_complete(struct urb *urb) |
| 372 | { | 372 | { |
| 373 | kfree(urb->context); | 373 | kfree(urb->context); |
| 374 | usb_free_urb(urb); | 374 | usb_free_urb(urb); |