From fc10f79f1eccda9ab4c31c6f82c82aea8456b8dd Mon Sep 17 00:00:00 2001 From: Andrey Volkov Date: Sat, 12 Nov 2005 22:04:06 +0000 Subject: [PATCH] --- yaml --- r: 14128 b: refs/heads/master c: 38801e2e54308ec52fc580c0fcdee98fe8696195 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/mpc52xx_uart.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c3c3c68032ef..4f4303114c0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46677736bec5c44601987e8780e55bc242e0aa46 +refs/heads/master: 38801e2e54308ec52fc580c0fcdee98fe8696195 diff --git a/trunk/drivers/serial/mpc52xx_uart.c b/trunk/drivers/serial/mpc52xx_uart.c index 5d3cb8486447..b8727d9bf690 100644 --- a/trunk/drivers/serial/mpc52xx_uart.c +++ b/trunk/drivers/serial/mpc52xx_uart.c @@ -725,7 +725,7 @@ mpc52xx_uart_probe(struct platform_device *dev) int i, idx, ret; /* Check validity & presence */ - idx = pdev->id; + idx = dev->id; if (idx < 0 || idx >= MPC52xx_PSC_MAXNUM) return -EINVAL; @@ -748,7 +748,7 @@ mpc52xx_uart_probe(struct platform_device *dev) port->ops = &mpc52xx_uart_ops; /* Search for IRQ and mapbase */ - for (i=0 ; inum_resources ; i++, res++) { + for (i=0 ; inum_resources ; i++, res++) { if (res->flags & IORESOURCE_MEM) port->mapbase = res->start; else if (res->flags & IORESOURCE_IRQ)