From 5bbb5f237d99f523195adb32d7e497b44f0071af Mon Sep 17 00:00:00 2001
From: Fengguang Wu <fengguang.wu@intel.com>
Date: Sat, 28 Jul 2012 20:43:57 +0800
Subject: [PATCH] --- yaml --- r: 325690 b: refs/heads/master c:
 a92098a1cb7ec08c86d1b97d1831d8edaf26b1a2 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/tty/serial/pch_uart.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 27d78b6ebe6e..c5926cf2de2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 221ca778d677c5ec3a33385a3b6dd548174252a6
+refs/heads/master: a92098a1cb7ec08c86d1b97d1831d8edaf26b1a2
diff --git a/trunk/drivers/tty/serial/pch_uart.c b/trunk/drivers/tty/serial/pch_uart.c
index 558ce8509a9a..4cd6c2381528 100644
--- a/trunk/drivers/tty/serial/pch_uart.c
+++ b/trunk/drivers/tty/serial/pch_uart.c
@@ -979,6 +979,10 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
 	priv->tx_dma_use = 1;
 
 	priv->sg_tx_p = kzalloc(sizeof(struct scatterlist)*num, GFP_ATOMIC);
+	if (!priv->sg_tx_p) {
+		dev_err(priv->port.dev, "%s:kzalloc Failed\n", __func__);
+		return 0;
+	}
 
 	sg_init_table(priv->sg_tx_p, num); /* Initialize SG table */
 	sg = priv->sg_tx_p;