diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2013-01-17 15:34:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 02:31:24 +0100 |
| commit | b786337d8c2867962348711e8d1211b292b6e3c5 (patch) | |
| tree | 4d0179bee370162a17122a462cce2f36f539da1a | |
| parent | serial: rp2: New driver for Comtrol RocketPort 2 cards (diff) | |
| download | linux-b786337d8c2867962348711e8d1211b292b6e3c5.tar.xz linux-b786337d8c2867962348711e8d1211b292b6e3c5.zip | |
serial: sccnxp: Fix possible crash if no platform data supplied
This patch fix possible kernel crash if no platform data supplied.
We should not use platform data in this case, instead we will use
default values from private driver structure.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/sccnxp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index c864353352c5..c5f0e964ec05 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c @@ -891,9 +891,9 @@ static int sccnxp_probe(struct platform_device *pdev) } else memcpy(&s->pdata, pdata, sizeof(struct sccnxp_pdata)); - if (pdata->poll_time_us) { + if (s->pdata.poll_time_us) { dev_info(&pdev->dev, "Using poll mode, resolution %u usecs\n", - pdata->poll_time_us); + s->pdata.poll_time_us); s->poll = 1; } |