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

Commit df59577d authored Apr 08, 2017 by David S. Miller

Merge tag 'linux-can-fixes-for-4.12-20170404' of...

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



Marc Kleine-Budde says:

====================
pull-request: can 2017-04-04

this is a pull request of two patches for net/master.

The first patch by Markus Marb fixes a register read access in the ifi driver.
The second patch by Geert Uytterhoeven for the rcar driver remove the printing
of a kernel virtual address.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 7cc2b043 ca257b9e

drivers/net/can/ifi_canfd/ifi_canfd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -557,7 +557,7 @@ static int ifi_canfd_poll(struct napi_struct *napi, int quota)
		int work_done = 0;

		u32 stcmd = readl(priv->base + IFI_CANFD_STCMD);
		u32 rxstcmd = readl(priv->base + IFI_CANFD_STCMD);
		u32 rxstcmd = readl(priv->base + IFI_CANFD_RXSTCMD);
		u32 errctr = readl(priv->base + IFI_CANFD_ERROR_CTR);

		/* Handle bus state changes */

drivers/net/can/rcar/rcar_can.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -826,8 +826,7 @@ static int rcar_can_probe(struct platform_device *pdev)

		devm_can_led_init(ndev);

		dev_info(&pdev->dev, "device registered (regs @ %p, IRQ%d)\n",
		priv->regs, ndev->irq);
		dev_info(&pdev->dev, "device registered (IRQ%d)\n", ndev->irq);

		return 0;
		fail_candev: