diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-23 15:03:14 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-23 15:03:14 -0400 |
| commit | e2a71e13fbd37490b96381073302a4a621373e49 (patch) | |
| tree | fb7acca6c1fdcd7a86c8f57b33b3026d4d54a35d | |
| parent | e3aad9c8d49b8aa1767aa131aafd37aa1f534ec5 (diff) | |
| download | kernel-e2a71e13fbd37490b96381073302a4a621373e49.tar.gz kernel-e2a71e13fbd37490b96381073302a4a621373e49.tar.xz kernel-e2a71e13fbd37490b96381073302a4a621373e49.zip | |
Drop upstream merged patch
| -rw-r--r-- | 0001-stmmac-fix-setting-of-driver-data-in-stmmac_dvr_prob.patch | 33 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 0 insertions, 36 deletions
diff --git a/0001-stmmac-fix-setting-of-driver-data-in-stmmac_dvr_prob.patch b/0001-stmmac-fix-setting-of-driver-data-in-stmmac_dvr_prob.patch deleted file mode 100644 index 5b5a2d375..000000000 --- a/0001-stmmac-fix-setting-of-driver-data-in-stmmac_dvr_prob.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e3197f80ac597912808f8ad07ba727c7fdafc50 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Tue, 21 Jul 2015 09:49:19 +0100 -Subject: [PATCH] stmmac: fix setting of driver data in stmmac_dvr_probe - -Commit 803f8fc46274b ("stmmac: move driver data setting into -stmmac_dvr_probe") mistakenly set priv and not priv->dev as -driver data. This meant that the remove, resume and suspend -callbacks that fetched and tried to use this data would most -likely explode. Fix the issue by using the correct variable. - -Fixes: 803f8fc46274b ("stmmac: move driver data setting into stmmac_dvr_probe") -Signed-off-by: Joachim Eastwood <manabian@xxxxxxxxx> ---- - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index 50f7a7a..864b476 100644 ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -2843,7 +2843,7 @@ int stmmac_dvr_probe(struct device *device, - if (res->mac) - memcpy(priv->dev->dev_addr, res->mac, ETH_ALEN); - -- dev_set_drvdata(device, priv); -+ dev_set_drvdata(device, priv->dev); - - /* Verify driver arguments */ - stmmac_verify_args(); --- -2.4.6 - diff --git a/kernel.spec b/kernel.spec index 76c61af73..e4f45a4c6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -586,9 +586,6 @@ Patch503: drm-i915-turn-off-wc-mmaps.patch Patch504: kdbus.patch -# http://www.spinics.net/lists/netdev/msg336243.html -Patch505: 0001-stmmac-fix-setting-of-driver-data-in-stmmac_dvr_prob.patch - # END OF PATCH DEFINITIONS %endif |