From 7c37f7515cfd111e433cbd6923fba3e09cbb6a85 Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Fri, 8 Feb 2008 04:21:07 -0800
Subject: [PATCH] --- yaml --- r: 84767 b: refs/heads/master c:
 6433471d33c09d69d029b1c4b7bdd1612c492587 h: refs/heads/master i:   84765:
 5054f94dcf6f6dce13b4c5c3769ca3544c050fa1   84763:
 49ebae2771c5af70d346f1c673174d75262d8cdc   84759:
 a671ca852c4931f8a9fd2b476ff706b03f29f3ca   84751:
 b1ccacce19b7565bd5dc697dafb362abe24a061f   84735:
 73d5043265e774ea0d4dfc92b7e1b4e6780f991d v: v3

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

diff --git a/[refs] b/[refs]
index 29b272728638..d26b617eff82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a66706158d6bc4d9eb29c37852001f78f4c8989c
+refs/heads/master: 6433471d33c09d69d029b1c4b7bdd1612c492587
diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c
index d15ab2243289..e08fe64e4466 100644
--- a/trunk/drivers/serial/atmel_serial.c
+++ b/trunk/drivers/serial/atmel_serial.c
@@ -1469,7 +1469,8 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev)
 
 	if (!atmel_use_dma_rx(&port->uart)) {
 		ret = -ENOMEM;
-		data = kmalloc(ATMEL_SERIAL_RINGSIZE, GFP_KERNEL);
+		data = kmalloc(sizeof(struct atmel_uart_char)
+				* ATMEL_SERIAL_RINGSIZE, GFP_KERNEL);
 		if (!data)
 			goto err_alloc_ring;
 		port->rx_ring.buf = data;