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;