---

yaml --- r: 325690 b: refs/heads/master c: a92098a h: refs/heads/master v: v3
git-mirror · Aug 16, 2012 · 5bbb5f2 · 5bbb5f2
1 parent 9febc7d
commit 5bbb5f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;