From 0a9b1a78042cb6688df1face6ca22724bd34803c Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 9 May 2013 13:50:55 +0100
Subject: [PATCH] --- yaml --- r: 376061 b: refs/heads/master c:
 f6b6f52b583003ad443d5709c56b8858466c4268 h: refs/heads/master i:   376059:
 5ef06d1db10e1e470dc3ddb1b5f7252f0b1e555c v: v3

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

diff --git a/[refs] b/[refs]
index b90117bf6741..d98aed0be0e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 383d2fc96c1983f5cd7fca3a3b1c9b8d8ee0de66
+refs/heads/master: f6b6f52b583003ad443d5709c56b8858466c4268
diff --git a/trunk/drivers/tty/serial/amba-pl011.c b/trunk/drivers/tty/serial/amba-pl011.c
index 8ab70a620919..e2774f9ecd59 100644
--- a/trunk/drivers/tty/serial/amba-pl011.c
+++ b/trunk/drivers/tty/serial/amba-pl011.c
@@ -332,7 +332,7 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port *
 		dmaengine_slave_config(chan, &rx_conf);
 		uap->dmarx.chan = chan;
 
-		if (plat->dma_rx_poll_enable) {
+		if (plat && plat->dma_rx_poll_enable) {
 			/* Set poll rate if specified. */
 			if (plat->dma_rx_poll_rate) {
 				uap->dmarx.auto_poll_rate = false;