---

yaml --- r: 84767 b: refs/heads/master c: 6433471 h: refs/heads/master i: 84765: 5054f94 84763: 49ebae2 84759: a671ca8 84751: b1ccacc 84735: 73d5043 v: v3
git-mirror · Feb 8, 2008 · 7c37f75 · 7c37f75
1 parent 162c94e
commit 7c37f75
Show file tree

Hide file tree

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