Skip to content

Commit

Permalink
can: c_can_platform: Fix raminit, use devm_ioremap() instead of devm_…
Browse files Browse the repository at this point in the history
…ioremap_resource()

The raminit register is shared register for both can0 and can1. Since commit:

    32766ff net: can: Convert to use devm_ioremap_resource

devm_ioremap_resource() is used to map raminit register. When using both
interfaces the mapping for the can1 interface fails, leading to a non
functional can interface.

Signed-off-by: George Cherian <george.cherian@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.11
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
George Cherian authored and Marc Kleine-Budde committed Jul 25, 2014
1 parent 15ba223 commit 33cf756
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/can/c_can/c_can_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 33cf756

Please sign in to comment.