diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-08 18:48:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-08 18:48:50 +0300 |
| commit | df59577d8c6fecc53e0ea8e98519ee83b4ca5b04 (patch) | |
| tree | 4cb6387a37615552c957077cf6ab398188fe7cae | |
| parent | 7cc2b043bc3f1e8139e807528c8041c15924a411 (diff) | |
| parent | ca257b9e2d807ab6cb2678ecc7b74aaf4651f597 (diff) | |
| download | linux-df59577d8c6fecc53e0ea8e98519ee83b4ca5b04.tar.xz | |
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>
| -rw-r--r-- | drivers/net/can/ifi_canfd/ifi_canfd.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/rcar/rcar_can.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c index 138f5ae75c0b..4d1fe8d95042 100644 --- a/drivers/net/can/ifi_canfd/ifi_canfd.c +++ b/drivers/net/can/ifi_canfd/ifi_canfd.c @@ -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 */ diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c index caed4e6960f8..11662f479e76 100644 --- a/drivers/net/can/rcar/rcar_can.c +++ b/drivers/net/can/rcar/rcar_can.c @@ -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: |