mirror of
https://abf.rosa.ru/djam/kernel-6.6.git
synced 2025-02-25 20:02:47 +00:00
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From foo@baz Thu Feb 23 21:13:05 CET 2017
|
|
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
|
|
Date: Tue, 14 Feb 2017 14:42:15 +0200
|
|
Subject: net: ethernet: ti: cpsw: fix cpsw assignment in resume
|
|
|
|
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
|
|
|
|
|
|
[ Upstream commit a60ced990e309666915d21445e95347d12406694 ]
|
|
|
|
There is a copy-paste error, which hides breaking of resume
|
|
for CPSW driver: there was replaced netdev_priv() to ndev_to_cpsw(ndev)
|
|
in suspend, but left it unchanged in resume.
|
|
|
|
Fixes: 606f39939595a4d4540406bfc11f265b2036af6d
|
|
(ti: cpsw: move platform data and slaves info to cpsw_common)
|
|
|
|
Reported-by: Alexey Starikovskiy <AStarikovskiy@topcon.com>
|
|
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/net/ethernet/ti/cpsw.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/ti/cpsw.c
|
|
+++ b/drivers/net/ethernet/ti/cpsw.c
|
|
@@ -2925,7 +2925,7 @@ static int cpsw_resume(struct device *de
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
struct net_device *ndev = platform_get_drvdata(pdev);
|
|
- struct cpsw_common *cpsw = netdev_priv(ndev);
|
|
+ struct cpsw_common *cpsw = ndev_to_cpsw(ndev);
|
|
|
|
/* Select default pin state */
|
|
pinctrl_pm_select_default_state(dev);
|