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

Commit 37464a8a authored by Diana Craciun's avatar Diana Craciun Committed by Greg Kroah-Hartman
Browse files

bus/fsl_mc: Do not rely on caller to provide non NULL mc_io 



[ Upstream commit 5026cf605143e764e1785bbf9158559d17f8d260 ]

Before destroying the mc_io, check first that it was
allocated.

Reviewed-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: default avatarDiana Craciun <diana.craciun@oss.nxp.com>
Link: https://lore.kernel.org/r/20200929085441.17448-11-diana.craciun@oss.nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0606a8df

drivers/bus/fsl-mc/mc-io.c

+6 −1
Original line number Diff line number Diff line
@@ -129,7 +129,12 @@ int __must_check fsl_create_mc_io(struct device *dev, 
 */

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);