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

Commit 48051c37 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-4.11-20170303' of... 

Merge tag 'linux-can-fixes-for-4.11-20170303' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2017-03-03

this is a pull request for the upcoming v4.11 release.

There are two patches by Ethan Zonca for the gs_usb driver, the first one fixes
the memory used for USB transfers, the second one the coding style.

The last two patches are by me, one fixing a memory leak in the usb_8dev driver
the other a typo in the flexcan driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a8d63a53 66ddb821

drivers/net/can/flexcan.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 
#define FLEXCAN_QUIRK_BROKEN_ERR_STATE	BIT(1) /* [TR]WRN_INT not connected */

#define FLEXCAN_QUIRK_DISABLE_RXFG	BIT(2) /* Disable RX FIFO Global mask */

#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS	BIT(3) /* Enable EACEN and RRS bit in ctrl2 */

#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disble Memory error detection */

#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disable Memory error detection */

#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP	BIT(5) /* Use timestamp based offloading */



/* Structure of the message buffer */

drivers/net/can/usb/gs_usb.c

+34 −17
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb, 
				  hf,

				  urb->transfer_dma);





		if (rc == -ENODEV) {

			netif_device_detach(netdev);

		} else {
@@ -908,10 +907,14 @@ static int gs_usb_probe(struct usb_interface *intf, 
	struct gs_usb *dev;

	int rc = -ENOMEM;

	unsigned int icount, i;

	struct gs_host_config hconf = {

		.byte_order = 0x0000beef,

	};

	struct gs_device_config dconf;

	struct gs_host_config *hconf;

	struct gs_device_config *dconf;



	hconf = kmalloc(sizeof(*hconf), GFP_KERNEL);

	if (!hconf)

		return -ENOMEM;



	hconf->byte_order = 0x0000beef;



	/* send host config */

	rc = usb_control_msg(interface_to_usbdev(intf),
@@ -920,16 +923,22 @@ static int gs_usb_probe(struct usb_interface *intf, 
			     USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,

			     1,

			     intf->altsetting[0].desc.bInterfaceNumber,

			     &hconf,

			     sizeof(hconf),

			     hconf,

			     sizeof(*hconf),

			     1000);



	kfree(hconf);



	if (rc < 0) {

		dev_err(&intf->dev, "Couldn't send data format (err=%d)\n",

			rc);

		return rc;

	}



	dconf = kmalloc(sizeof(*dconf), GFP_KERNEL);

	if (!dconf)

		return -ENOMEM;



	/* read device config */

	rc = usb_control_msg(interface_to_usbdev(intf),

			     usb_rcvctrlpipe(interface_to_usbdev(intf), 0),
@@ -937,28 +946,33 @@ static int gs_usb_probe(struct usb_interface *intf, 
			     USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,

			     1,

			     intf->altsetting[0].desc.bInterfaceNumber,

			     &dconf,

			     sizeof(dconf),

			     dconf,

			     sizeof(*dconf),

			     1000);

	if (rc < 0) {

		dev_err(&intf->dev, "Couldn't get device config: (err=%d)\n",

			rc);

		kfree(dconf);

		return rc;

	}



	icount = dconf.icount + 1;

	icount = dconf->icount + 1;

	dev_info(&intf->dev, "Configuring for %d interfaces\n", icount);



	if (icount > GS_MAX_INTF) {

		dev_err(&intf->dev,

			"Driver cannot handle more that %d CAN interfaces\n",

			GS_MAX_INTF);

		kfree(dconf);

		return -EINVAL;

	}



	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

	if (!dev) {

		kfree(dconf);

		return -ENOMEM;

	}



	init_usb_anchor(&dev->rx_submitted);



	atomic_set(&dev->active_channels, 0);
@@ -967,7 +981,7 @@ static int gs_usb_probe(struct usb_interface *intf, 
	dev->udev = interface_to_usbdev(intf);



	for (i = 0; i < icount; i++) {

		dev->canch[i] = gs_make_candev(i, intf, &dconf);

		dev->canch[i] = gs_make_candev(i, intf, dconf);

		if (IS_ERR_OR_NULL(dev->canch[i])) {

			/* save error code to return later */

			rc = PTR_ERR(dev->canch[i]);
@@ -978,12 +992,15 @@ static int gs_usb_probe(struct usb_interface *intf, 
				gs_destroy_candev(dev->canch[i]);



			usb_kill_anchored_urbs(&dev->rx_submitted);

			kfree(dconf);

			kfree(dev);

			return rc;

		}

		dev->canch[i]->parent = dev;

	}



	kfree(dconf);



	return 0;

}

drivers/net/can/usb/usb_8dev.c

+3 −6
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ static int usb_8dev_probe(struct usb_interface *intf, 
	for (i = 0; i < MAX_TX_URBS; i++)

		priv->tx_contexts[i].echo_index = MAX_TX_URBS;



	priv->cmd_msg_buffer = kzalloc(sizeof(struct usb_8dev_cmd_msg),

	priv->cmd_msg_buffer = devm_kzalloc(&intf->dev, sizeof(struct usb_8dev_cmd_msg),

					    GFP_KERNEL);

	if (!priv->cmd_msg_buffer)

		goto cleanup_candev;
@@ -966,7 +966,7 @@ static int usb_8dev_probe(struct usb_interface *intf, 
	if (err) {

		netdev_err(netdev,

			"couldn't register CAN device: %d\n", err);

		goto cleanup_cmd_msg_buffer;

		goto cleanup_candev;

	}



	err = usb_8dev_cmd_version(priv, &version);
@@ -987,9 +987,6 @@ static int usb_8dev_probe(struct usb_interface *intf, 
cleanup_unregister_candev:

	unregister_netdev(priv->netdev);



cleanup_cmd_msg_buffer:

	kfree(priv->cmd_msg_buffer);



cleanup_candev:

	free_candev(netdev);