diff --git a/[refs] b/[refs] index 7c52ad511cb4..e20d0735f7b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d9f49afa451d8565d00a5cea39acf9bb26feb50 +refs/heads/master: b786337d8c2867962348711e8d1211b292b6e3c5 diff --git a/trunk/drivers/tty/serial/sccnxp.c b/trunk/drivers/tty/serial/sccnxp.c index c864353352c5..c5f0e964ec05 100644 --- a/trunk/drivers/tty/serial/sccnxp.c +++ b/trunk/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; }