diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-02 01:49:50 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-02 01:49:50 +0400 |
| commit | f91ca783f11029940aa60a9a5aad4dce666e6414 (patch) | |
| tree | f5ec20b9cbf024eabdfb7862f4fd6d51e31be8ea /drivers/net/can/usb | |
| parent | 7f1f6056f2f7293d5108eda905af42df58b78370 (diff) | |
| parent | b1d8e431bd5639c03ff99d08fd2d5d621969bdc5 (diff) | |
| download | linux-f91ca783f11029940aa60a9a5aad4dce666e6414.tar.xz | |
Merge tag 'linux-can-fixes-for-3.15-20140401' of git://gitorious.org/linux-can/linux-can
linux-can-fixes-for-3.15-20140401
Marc Kleine-Budde says:
====================
this is a pull request of 16 patches for the 3.15 release cycle.
Bjorn Van Tilt contributes a patch which fixes a memory leak in usb_8dev's
usb_8dev_start_xmit()s error path. A patch by Robert Schwebel fixes a typo in
the can documentation. The remaining patches all target the c_can driver. Two
of them are by me; they add a missing netif_napi_del() and return value
checking. Thomas Gleixner contributes 12 patches, which address several
shortcomings in the driver like hardware initialisation, concurrency, message
ordering and poor performance.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/usb')
| -rw-r--r-- | drivers/net/can/usb/usb_8dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c index cde263459932..ef674ecb82f8 100644 --- a/drivers/net/can/usb/usb_8dev.c +++ b/drivers/net/can/usb/usb_8dev.c @@ -697,8 +697,8 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; nofreecontext: - usb_unanchor_urb(urb); usb_free_coherent(priv->udev, size, buf, urb->transfer_dma); + usb_free_urb(urb); netdev_warn(netdev, "couldn't find free context"); |