Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e27472ac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "can: kvaser_usb: free buf in error paths" 



This reverts commit 70d9dccf which was
commit 435019b48033138581a6171093b181fc6b4d3d30 upstream.

Jimmy Assarsson asks that it be reverted as it's not correct there.

Reported-by: default avatarJimmy Assarsson <jimmyassarsson@gmail.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f244e55

drivers/net/can/usb/kvaser_usb.c

+0 −2
Original line number Diff line number Diff line
@@ -602,7 +602,6 @@ static int kvaser_usb_simple_msg_async(struct kvaser_usb_net_priv *priv, 
	if (err) {

		netdev_err(netdev, "Error transmitting URB\n");

		usb_unanchor_urb(urb);

		kfree(buf);

		usb_free_urb(urb);

		kfree(buf);

		return err;
@@ -1389,7 +1388,6 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb, 


		atomic_dec(&priv->active_tx_urbs);

		usb_unanchor_urb(urb);

		kfree(buf);



		stats->tx_dropped++;