Skip to contentSkip to conversation

Patch "net: ethernet: ti: cpsw: fix cpsw assignment in resume" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Feb 23, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

net: ethernet: ti: cpsw: fix cpsw assignment in resume

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-ethernet-ti-cpsw-fix-cpsw-assignment-in-resume.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Thu Feb 23 21:13:05 CET 2017

From: Ivan Khoronzhuk <[email protected]>
Date: Tue, 14 Feb 2017 14:42:15 +0200
Subject: net: ethernet: ti: cpsw: fix cpsw assignment in resume

From: Ivan Khoronzhuk <[email protected]>

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

---
 drivers/net/ethernet/ti/cpsw.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/net-ethernet-ti-cpsw-fix-cpsw-assignment-in-resume.patch