diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-24 15:33:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-24 15:33:10 -0400 |
commit | e988f306e7241a0adddb650357d34b6537d77b0e (patch) | |
tree | 6f13d31af2ec7518785ce73dcb6b850f70964f17 /drivers/usb/gadget/f_rndis.c | |
parent | a798c10faf62a505d24e5f6213fbaf904a39623f (diff) | |
parent | a31a942a148e0083ce560ffeb54fb60e06ab7201 (diff) |
Merge tag 'fixes-for-v3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v3.15-rc3
Quite a few fixes this time since I lost v3.15-rc2
window.
Most fixes are MUSB which learned to remove its debugfs directories
properly, got a fix for PHY handling and now knows that it should
make sure its clocks aren't gated before trying to access registers.
ffs got a race fix between ffs_epfile_io() and ffs_func_eps_disable().
dwc3 got a fix for system suspend/resume and now only iterates over
valid endpoints when trying to resize TX fifos.
usb_get_phy() now will properly return an error if try_module_get() fails.
We also have a revert for a NAPI conversion on the ethernet gadget which
was causing a kernel BUG.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/f_rndis.c')
-rw-r--r-- | drivers/usb/gadget/f_rndis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index c11761ce5113..9a4f49dc6ac4 100644 --- a/drivers/usb/gadget/f_rndis.c +++ b/drivers/usb/gadget/f_rndis.c | |||
@@ -377,7 +377,7 @@ static struct sk_buff *rndis_add_header(struct gether *port, | |||
377 | if (skb2) | 377 | if (skb2) |
378 | rndis_add_hdr(skb2); | 378 | rndis_add_hdr(skb2); |
379 | 379 | ||
380 | dev_kfree_skb_any(skb); | 380 | dev_kfree_skb(skb); |
381 | return skb2; | 381 | return skb2; |
382 | } | 382 | } |
383 | 383 | ||