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

Commit cec83ff1 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

ARM: OMAP1: ams-delta: Fix possible use of uninitialized field 



While playing with initialization order of modem device, it has been
discovered that under some circumstances (early console init, I
believe) its .pm() callback may be called before the
uart_port->private_data pointer is initialized from
plat_serial8250_port->private_data, resulting in NULL pointer
dereference.  Fix it by checking for uninitialized pointer before using
it in modem_pm().

Fixes: aabf3173 ("ARM: OMAP1: ams-delta: update the modem to use regulator API")
Signed-off-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 419b194c

arch/arm/mach-omap1/board-ams-delta.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -750,6 +750,9 @@ static void modem_pm(struct uart_port *port, unsigned int state, unsigned old) 
	struct modem_private_data *priv = port->private_data;

	struct modem_private_data *priv = port->private_data;

	int ret;

	int ret;





	if (!priv)

		return;



	if (IS_ERR(priv->regulator))

	if (IS_ERR(priv->regulator))

		return;

		return;