Commit 6433471d authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds

atmel_serial: fix broken RX buffer allocation

Introduced by atmel_serial-split-the-interrupt-handler.patch.

Thanks to michael <trimarchi@gandalf.sssup.it> for spotting it.
Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6670615
...@@ -1469,7 +1469,8 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) ...@@ -1469,7 +1469,8 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev)
if (!atmel_use_dma_rx(&port->uart)) { if (!atmel_use_dma_rx(&port->uart)) {
ret = -ENOMEM; ret = -ENOMEM;
data = kmalloc(ATMEL_SERIAL_RINGSIZE, GFP_KERNEL); data = kmalloc(sizeof(struct atmel_uart_char)
* ATMEL_SERIAL_RINGSIZE, GFP_KERNEL);
if (!data) if (!data)
goto err_alloc_ring; goto err_alloc_ring;
port->rx_ring.buf = data; port->rx_ring.buf = data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment