Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9966fc59 authored by Ivan Bornyakov's avatar Ivan Bornyakov Committed by Greg Kroah-Hartman
Browse files

bus: imx-weim: fix branch condition evaluates to a garbage value 



[ Upstream commit 1adab2922c58e7ff4fa9f0b43695079402cce876 ]

If bus type is other than imx50_weim_devtype and have no child devices,
variable 'ret' in function weim_parse_dt() will not be initialized, but
will be used as branch condition and return value. Fix this by
initializing 'ret' with 0.

This was discovered with help of clang-analyzer, but the situation is
quite possible in real life.

Fixes: 52c47b63 ("bus: imx-weim: improve error handling upon child probe-failure")
Signed-off-by: default avatarIvan Bornyakov <i.bornyakov@metrotek.ru>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d121f788

drivers/bus/imx-weim.c

+1 −1
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ static int weim_parse_dt(struct platform_device *pdev, void __iomem *base) 
	const struct of_device_id *of_id = of_match_device(weim_id_table,

							   &pdev->dev);

	const struct imx_weim_devtype *devtype = of_id->data;

	int ret = 0, have_child = 0;

	struct device_node *child;

	int ret, have_child = 0;

	struct cs_timing_state ts = {};

	u32 reg;