]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "can: kvaser_usb: free buf in error paths"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jan 2018 17:45:25 +0000 (18:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2018 08:29:31 +0000 (09:29 +0100)
This reverts commit 70d9dccf50152b0d7bfb2697d8c51e9fab9f782c which was
commit 435019b48033138581a6171093b181fc6b4d3d30 upstream.

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

Reported-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/can/usb/kvaser_usb.c

index 4745164e43253944e1d0ebec51807054350d8735..355914a3159163cd9b9c456922339ed4650ab8f8 100644 (file)
@@ -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++;