Commit 06829937 authored by David S. Miller's avatar David S. Miller

Merge tag 'linux-can-fixes-for-5.4-20191122' of...

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

Marc Kleine-Budde says:

====================
pull-request: can 2019-11-22

this is a pull request of 2 patches for net/master, if possible for the
current release cycle. Otherwise these patches should hit v5.4 via the
stable tree.

Both patches of this pull request target the m_can driver. Pankaj Sharma
fixes the fallout in the m_can_platform part, which appeared with the
introduction of the m_can platform framework.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents efabb6c6 0704c574
...@@ -107,7 +107,7 @@ static int m_can_plat_probe(struct platform_device *pdev) ...@@ -107,7 +107,7 @@ static int m_can_plat_probe(struct platform_device *pdev)
mcan_class->is_peripheral = false; mcan_class->is_peripheral = false;
platform_set_drvdata(pdev, mcan_class->dev); platform_set_drvdata(pdev, mcan_class->net);
m_can_init_ram(mcan_class); m_can_init_ram(mcan_class);
...@@ -166,8 +166,6 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev) ...@@ -166,8 +166,6 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev)
if (err) if (err)
clk_disable_unprepare(mcan_class->hclk); clk_disable_unprepare(mcan_class->hclk);
m_can_class_resume(dev);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment