From 8bf70a74d315e41ec57f8c095182e1547769fdfe Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 21 Jun 2011 12:17:00 +0800 Subject: [PATCH] --- yaml --- r: 254301 b: refs/heads/master c: deba1a0d58b54905a5201cb9e1aa878cfc74ff70 h: refs/heads/master i: 254299: c681d03890da638475b2922f3e805a994239223d v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/atmel_serial.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 811b478fcf9f..481002f90673 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c1f9668692061b97125e343721c7514ca05a8bb +refs/heads/master: deba1a0d58b54905a5201cb9e1aa878cfc74ff70 diff --git a/trunk/drivers/tty/serial/atmel_serial.c b/trunk/drivers/tty/serial/atmel_serial.c index 6d5d6e679fc7..af9b7814965a 100644 --- a/trunk/drivers/tty/serial/atmel_serial.c +++ b/trunk/drivers/tty/serial/atmel_serial.c @@ -1709,12 +1709,13 @@ static int atmel_serial_resume(struct platform_device *pdev) static int __devinit atmel_serial_probe(struct platform_device *pdev) { struct atmel_uart_port *port; + struct atmel_uart_data *pdata = pdev->dev.platform_data; void *data; int ret; BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1)); - port = &atmel_ports[pdev->id]; + port = &atmel_ports[pdata->num]; port->backup_imr = 0; atmel_init_port(port, pdev);