Commit 78106927 authored by David S. Miller's avatar David S. Miller

Merge branch 'fixes-for-3.13' of git://gitorious.org/linux-can/linux-can

Marc Kleine-Budde says:

====================
this is a pull request with two fixes for net/master, the current release
cycle.

It consists of a patch by Alexey Khoroshilov from the Linux Driver Verification
project, which fixes a memory leak in ems_usb's failure patch. And a patch by
me which fixes a memory leak in the peak usb driver.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a7c12639 20fb4eb9
...@@ -625,6 +625,7 @@ static int ems_usb_start(struct ems_usb *dev) ...@@ -625,6 +625,7 @@ static int ems_usb_start(struct ems_usb *dev)
usb_unanchor_urb(urb); usb_unanchor_urb(urb);
usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf, usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,
urb->transfer_dma); urb->transfer_dma);
usb_free_urb(urb);
break; break;
} }
...@@ -798,8 +799,8 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne ...@@ -798,8 +799,8 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
* allowed (MAX_TX_URBS). * allowed (MAX_TX_URBS).
*/ */
if (!context) { if (!context) {
usb_unanchor_urb(urb);
usb_free_coherent(dev->udev, size, buf, urb->transfer_dma); usb_free_coherent(dev->udev, size, buf, urb->transfer_dma);
usb_free_urb(urb);
netdev_warn(netdev, "couldn't find free context\n"); netdev_warn(netdev, "couldn't find free context\n");
......
...@@ -927,6 +927,9 @@ static int pcan_usb_pro_init(struct peak_usb_device *dev) ...@@ -927,6 +927,9 @@ static int pcan_usb_pro_init(struct peak_usb_device *dev)
/* set LED in default state (end of init phase) */ /* set LED in default state (end of init phase) */
pcan_usb_pro_set_led(dev, 0, 1); pcan_usb_pro_set_led(dev, 0, 1);
kfree(bi);
kfree(fi);
return 0; return 0;
err_out: err_out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment