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

Commit 31fbde99 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-4.3-20150820' of... 

Merge tag 'linux-can-next-for-4.3-20150820' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
this is a pull request of a two patches for net-next.

The first patch is by Nik Nyby and fixes a typo in a function name. The
second patch by Lucas Stach demotes register output to debug level.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c5f98b56 7a4b6c86

drivers/net/can/flexcan.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static void flexcan_set_bittiming(struct net_device *dev) 
	if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)

		reg |= FLEXCAN_CTRL_SMP;



	netdev_info(dev, "writing ctrl=0x%08x\n", reg);

	netdev_dbg(dev, "writing ctrl=0x%08x\n", reg);

	flexcan_write(reg, &regs->ctrl);



	/* print chip status */

drivers/net/can/usb/gs_usb.c

+4 −4
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ struct gs_can { 
	struct can_bittiming_const bt_const;

	unsigned int channel;	/* channel number */



	/* This lock prevents a race condition between xmit and recieve. */

	/* This lock prevents a race condition between xmit and receive. */

	spinlock_t tx_ctx_lock;

	struct gs_tx_context tx_context[GS_MAX_TX_URBS];
@@ -274,7 +274,7 @@ static void gs_update_state(struct gs_can *dev, struct can_frame *cf) 
	}

}



static void gs_usb_recieve_bulk_callback(struct urb *urb)

static void gs_usb_receive_bulk_callback(struct urb *urb)

{

	struct gs_usb *usbcan = urb->context;

	struct gs_can *dev;
@@ -376,7 +376,7 @@ static void gs_usb_recieve_bulk_callback(struct urb *urb) 
			  usb_rcvbulkpipe(usbcan->udev, GSUSB_ENDPOINT_IN),

			  hf,

			  sizeof(struct gs_host_frame),

			  gs_usb_recieve_bulk_callback,

			  gs_usb_receive_bulk_callback,

			  usbcan

			  );
@@ -605,7 +605,7 @@ static int gs_can_open(struct net_device *netdev) 
							  GSUSB_ENDPOINT_IN),

					  buf,

					  sizeof(struct gs_host_frame),

					  gs_usb_recieve_bulk_callback,

					  gs_usb_receive_bulk_callback,

					  parent);

			urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;