Commit 8356f976 authored Jul 28, 2014 by David S. Miller

linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2014-07-25

this is a pull request of one patch for the net tree, hoping to get into the
3.16 release.

The patch by George Cherian fixes a regression in the c_can platform driver.
When using two interfaces the regression leads to a non function second
interface.
====================

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

parents fe26566d 33cf7565

drivers/net/can/c_can/c_can_platform.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -287,7 +287,8 @@ static int c_can_plat_probe(struct platform_device *pdev)
		break;
		}

		priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);
		priv->raminit_ctrlreg = devm_ioremap(&pdev->dev, res->start,
		resource_size(res));
		if (IS_ERR(priv->raminit_ctrlreg) \|\| priv->instance < 0)
		dev_info(&pdev->dev, "control memory is not used for raminit\n");
		else