From 2a8279c161efeb243084d78d8077661c9122bb18 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 5 Nov 2020 23:42:51 +0100 Subject: 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 --- .../layerscape/patches-4.14/708-mc-bus-support-layerscape.patch | 9 +++++++-- 1 file 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 -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 + */ +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); -- cgit v1.2.3