From a840c4e16bafab7c50fc4bce0b770ec0e8636d3e Mon Sep 17 00:00:00 2001
From: Alexander Shiyan <shc_work@mail.ru>
Date: Thu, 17 Jan 2013 18:34:45 +0400
Subject: [PATCH] --- yaml --- r: 354813 b: refs/heads/master c:
 b786337d8c2867962348711e8d1211b292b6e3c5 h: refs/heads/master i:   354811:
 b1cf4eba37ceb07fc6f51ed317390b4fb1152ce9 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/tty/serial/sccnxp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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;
 	}