layerscape: Fix check after kernel update
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 5 Nov 2020 22:42:51 +0000 (23:42 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 16 Nov 2020 18:31:23 +0000 (19:31 +0100)
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>
target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch

index 7c6e25b038aa928cf8325043a9f1bfb4076e66b7..2cc78a557a892517cc57f6cdf957540a9aa4b289 100644 (file)
@@ -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);