Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:43 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:49 +0200
commite49000fd01924f7ddfc64f89eacb900395bbe497 (patch)
treeea4dcef78bedd0b814a8fd6b6dc7a1be985355e9
parent33631cc1f465483e8059015bdeaf92089d19c183 (diff)
net: seeq: fix crash caused by not set dev.parent (bnc#1012628).
-rw-r--r--patches.kernel.org/5.1.3-022-net-seeq-fix-crash-caused-by-not-set-dev.parent.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.kernel.org/5.1.3-022-net-seeq-fix-crash-caused-by-not-set-dev.parent.patch b/patches.kernel.org/5.1.3-022-net-seeq-fix-crash-caused-by-not-set-dev.parent.patch
new file mode 100644
index 0000000000..188913e2a3
--- /dev/null
+++ b/patches.kernel.org/5.1.3-022-net-seeq-fix-crash-caused-by-not-set-dev.parent.patch
@@ -0,0 +1,36 @@
+From: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+Date: Mon, 13 May 2019 13:15:17 +0200
+Subject: [PATCH] net: seeq: fix crash caused by not set dev.parent
+References: bnc#1012628
+Patch-mainline: 5.1.3
+Git-commit: 5afcd14cfc7fed1bcc8abcee2cef82732772bfc2
+
+[ Upstream commit 5afcd14cfc7fed1bcc8abcee2cef82732772bfc2 ]
+
+The old MIPS implementation of dma_cache_sync() didn't use the dev argument,
+but commit c9eb6172c328 ("dma-mapping: turn dma_cache_sync into a
+dma_map_ops method") changed that, so we now need to set dev.parent.
+
+Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/net/ethernet/seeq/sgiseeq.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
+index 70cce63a6081..696037d5ac3d 100644
+--- a/drivers/net/ethernet/seeq/sgiseeq.c
++++ b/drivers/net/ethernet/seeq/sgiseeq.c
+@@ -735,6 +735,7 @@ static int sgiseeq_probe(struct platform_device *pdev)
+ }
+
+ platform_set_drvdata(pdev, dev);
++ SET_NETDEV_DEV(dev, &pdev->dev);
+ sp = netdev_priv(dev);
+
+ /* Make private data page aligned */
+--
+2.21.0
+
diff --git a/series.conf b/series.conf
index f6048803b0..38d7790ec0 100644
--- a/series.conf
+++ b/series.conf
@@ -107,6 +107,7 @@
patches.kernel.org/5.1.3-019-net-dsa-Fix-error-cleanup-path-in-dsa_init_modu.patch
patches.kernel.org/5.1.3-020-net-ethernet-stmmac-dwmac-sun8i-enable-support-.patch
patches.kernel.org/5.1.3-021-net-macb-Change-interrupt-and-napi-enable-order.patch
+ patches.kernel.org/5.1.3-022-net-seeq-fix-crash-caused-by-not-set-dev.parent.patch
########################################################
# Build fixes that apply to the vanilla kernel too.