diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-22 09:42:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-22 09:42:11 -0800 |
| commit | 068299374cc4ef9a1990adda2d66c4afcacd5277 (patch) | |
| tree | d64e7575c3118033c625f20529b0bac5e4e04f45 | |
| parent | efabb6c6882fa389a2e4ead7d339ad0da5185279 (diff) | |
| parent | 0704c57436947c9f9f6472fd1a5ade41fc4c19d8 (diff) | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/can/m_can/m_can_platform.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c index 6ac4c35f247a..38ea5e600fb8 100644 --- a/drivers/net/can/m_can/m_can_platform.c +++ b/drivers/net/can/m_can/m_can_platform.c @@ -107,7 +107,7 @@ static int m_can_plat_probe(struct platform_device *pdev) 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); @@ -166,8 +166,6 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev) if (err) clk_disable_unprepare(mcan_class->hclk); - m_can_class_resume(dev); - return err; } |