[PATCH v2] net: ethernet: ti: cpsw: fix cpsw assignment in resume

[PATCH v2] net: ethernet: ti: cpsw: fix cpsw assignment in resume

[Ivan Khoronzhuk]

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>
---
Based on net/master

v1:
https://patchwork.ozlabs.org/patch/725876/

Since v1:
- rebased on net/master

 drivers/net/ethernet/ti/cpsw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index b203143..6508822 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -3160,7 +3160,7 @@ static int cpsw_resume(struct device *dev)
 {
 	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);
-- 
2.7.4

Re: [PATCH v2] net: ethernet: ti: cpsw: fix cpsw assignment in resume

[David Miller]

From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Date: Tue, 14 Feb 2017 14:42:15 +0200

> 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>

Applied and queued up for -stable, thanks.