Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14128
b: refs/heads/master
c: 38801e2
h: refs/heads/master
v: v3
  • Loading branch information
Andrey Volkov authored and Russell King committed Nov 12, 2005
1 parent c761a95 commit fc10f79
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 46677736bec5c44601987e8780e55bc242e0aa46
refs/heads/master: 38801e2e54308ec52fc580c0fcdee98fe8696195
4 changes: 2 additions & 2 deletions trunk/drivers/serial/mpc52xx_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -748,7 +748,7 @@ mpc52xx_uart_probe(struct platform_device *dev)
port->ops = &mpc52xx_uart_ops;

/* Search for IRQ and mapbase */
for (i=0 ; i<pdev->num_resources ; i++, res++) {
for (i=0 ; i<dev->num_resources ; i++, res++) {
if (res->flags & IORESOURCE_MEM)
port->mapbase = res->start;
else if (res->flags & IORESOURCE_IRQ)
Expand Down

0 comments on commit fc10f79

Please sign in to comment.