aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-11-05 23:42:51 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-11-16 19:31:23 +0100
commit2a8279c161efeb243084d78d8077661c9122bb18 (patch)
treecc6eb52aedb6a7410f4a94c59c7ac0f849ad1c19 /target/linux/layerscape
parentac5297340e647c63f98278eadc2f189608d4cd62 (diff)
downloadupstream-2a8279c161efeb243084d78d8077661c9122bb18.tar.gz
upstream-2a8279c161efeb243084d78d8077661c9122bb18.tar.bz2
upstream-2a8279c161efeb243084d78d8077661c9122bb18.zip
layerscape: Fix check after kernel update
The fsl_destroy_mc_io() function was moved, add the new checks to the moved copy and not just remove it. Fixes: ac5297340e64 ("kernel: bump 4.14 to 4.14.206") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch9
1 files changed, 7 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch b/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch
index 7c6e25b038..2cc78a557a 100644
--- a/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch
@@ -8911,7 +8911,7 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
-EXPORT_SYMBOL_GPL(fsl_mc_portal_reset);
--- /dev/null
+++ b/drivers/bus/fsl-mc/mc-io.c
-@@ -0,0 +1,281 @@
+@@ -0,0 +1,286 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
@@ -9043,7 +9043,12 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
+ */
+void fsl_destroy_mc_io(struct fsl_mc_io *mc_io)
+{
-+ struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
++ struct fsl_mc_device *dpmcp_dev;
++
++ if (!mc_io)
++ return;
++
++ dpmcp_dev = mc_io->dpmcp_dev;
+
+ if (dpmcp_dev)
+ fsl_mc_io_unset_dpmcp(mc_io);