]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
net: ethernet: ti: cpsw: fix cpsw assignment in resume
authorIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Tue, 14 Feb 2017 12:42:15 +0000 (14:42 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Feb 2017 19:54:19 +0000 (14:54 -0500)
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>
drivers/net/ethernet/ti/cpsw.c

index b203143647e6c0c39ae17b722366e52fa8f3ade8..65088224c207d9b6155192281b551cc823045b48 100644 (file)
@@ -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);