diff options
| author |   Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> | 2017-02-14 14:42:15 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-14 14:54:19 -0500 |
| commit | a60ced990e309666915d21445e95347d12406694 (patch) | |
| tree | 1f05027409768752bc38ce80d372c2abfbf215d3 /drivers/net/ethernet/ti/cpsw.c | |
| parent | kcm: fix a null pointer dereference in kcm_sendmsg() (diff) | |
| download | linux-dev-a60ced990e309666915d21445e95347d12406694.tar.xz linux-dev-a60ced990e309666915d21445e95347d12406694.zip | |
net: ethernet: ti: cpsw: fix cpsw assignment in resume
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index b203143647e6..65088224c207 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); |