summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2022-04-04 11:56:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-17 14:23:08 +0200
commit9abd50506fe4f86019b1230620c9e540805f857a (patch)
tree5d64f71bfbf4458d989f2b2d30ad2ebb75cf6b89
parent4d6f33865e2199ef118244f282282bd0721b47a1 (diff)
downloadlinux-stable-9abd50506fe4f86019b1230620c9e540805f857a.tar.gz
linux-stable-9abd50506fe4f86019b1230620c9e540805f857a.tar.bz2
linux-stable-9abd50506fe4f86019b1230620c9e540805f857a.zip
soc: fsl: guts: machine variable might be unset
[ Upstream commit ab3f045774f704c4e7b6a878102f4e9d4ae7bc74 ] If both the model and the compatible properties are missing, then machine will not be set. Initialize it with NULL. Fixes: 34c1c21e94ac ("soc: fsl: fix section mismatch build warnings") Signed-off-by: Michael Walle <michael@walle.cc> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/soc/fsl/guts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index 75eabfb916cb..0b2c7fdbaa5b 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -141,7 +141,7 @@ static int fsl_guts_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct resource *res;
const struct fsl_soc_die_attr *soc_die;
- const char *machine;
+ const char *machine = NULL;
u32 svr;
/* Initialize guts */