diff options
| author | Janusz Krzysztofik <jmkrzyszt@gmail.com> | 2018-11-07 22:30:31 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-11-08 09:25:44 -0800 |
| commit | cec83ff1241ec98113a19385ea9e9cfa9aa4125b (patch) | |
| tree | 66602c1a5cf5c642b7654aeac938596074c1fc9b /arch/arm/mach-omap1/board-ams-delta.c | |
| parent | 419b194cdedc76d0d3cd5b0900db0fa8177c4a52 (diff) | |
| download | linux-cec83ff1241ec98113a19385ea9e9cfa9aa4125b.tar.bz2 | |
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: aabf31737a6a ("ARM: OMAP1: ams-delta: update the modem to use regulator API")
Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 3d191fd52910..17886744dbe6 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -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; int ret; + if (!priv) + return; + if (IS_ERR(priv->regulator)) return; |