3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Janusz Krzysztofik <jmkrzy...@gmail.com>

commit cec83ff1241ec98113a19385ea9e9cfa9aa4125b upstream.

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: aabf31737a6a ("ARM: OMAP1: ams-delta: update the modem to use regulator 
API")
Signed-off-by: Janusz Krzysztofik <jmkrzy...@gmail.com>
Signed-off-by: Tony Lindgren <t...@atomide.com>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 arch/arm/mach-omap1/board-ams-delta.c | 3 +++
 1 file changed, 3 insertions(+)

--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -511,6 +511,9 @@ static void modem_pm(struct uart_port *p
 {
        struct modem_private_data *priv = port->private_data;
 
+       if (!priv)
+               return;
+
        if (IS_ERR(priv->regulator))
                return;
 

Reply via email to