diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-28 17:01:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-28 17:01:01 -0700 |
| commit | 8356f9768954e03494ce812f3985c665960ae3eb (patch) | |
| tree | 169c0dea832c28cfe3f776887ecb882f661fee69 /drivers | |
| parent | fe26566d8a05151ba1dce75081f6270f73ec4ae1 (diff) | |
| parent | 33cf75656923ff11d67a937a4f8e9344f58cea77 (diff) | |
| download | linux-8356f9768954e03494ce812f3985c665960ae3eb.tar.gz | |
Merge tag 'linux-can-fixes-for-3.16-20140725' of git://gitorious.org/linux-can/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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 824108cd9fd5..12430be6448a 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -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 |