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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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: David S. Miller <davem@davemloft.net>

David S. Miller 12 years ago 78106927 a7c12639

+5 -1

2 changed files

expand all

drivers

net

can

usb

ems_usb.c

peak_usb

pcan_usb_pro.c

+2 -1

drivers/net/can/usb/ems_usb.c

··· 625 625 usb_unanchor_urb(urb); 626 626 usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf, 627 627 urb->transfer_dma); 628 + usb_free_urb(urb); 628 629 break; 629 630 } 630 631 ··· 799 798 * allowed (MAX_TX_URBS). 800 799 */ 801 800 if (!context) { 802 - usb_unanchor_urb(urb); 803 801 usb_free_coherent(dev->udev, size, buf, urb->transfer_dma); 802 + usb_free_urb(urb); 804 803 805 804 netdev_warn(netdev, "couldn't find free context\n"); 806 805

drivers/net/can/usb/peak_usb/pcan_usb_pro.c

··· 927 927 /* set LED in default state (end of init phase) */ 928 928 pcan_usb_pro_set_led(dev, 0, 1); 929 929 930 + kfree(bi); 931 + kfree(fi); 932 + 930 933 return 0; 931 934 932 935 err_out: