Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Handle ISA devices with no 'regs' property.
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix of_iounmap() region release.
  [SPARC64]: Fix "mem=xxx" handling.

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 564592b2b2ba..3ec3df21816b 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1480,13 +1480,13 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m
         return 0;
 
 out_unmap:
-        of_iounmap(up->port.membase, up->reg_size);
+        of_iounmap(&op->resource[0], up->port.membase, up->reg_size);
         return err;
 }
 
-static int __devexit su_remove(struct of_device *dev)
+static int __devexit su_remove(struct of_device *op)
 {
-        struct uart_sunsu_port *up = dev_get_drvdata(&dev->dev);;
+        struct uart_sunsu_port *up = dev_get_drvdata(&op->dev);
 
         if (up->su_type == SU_PORT_MS ||
             up->su_type == SU_PORT_KBD) {
@@ -1499,9 +1499,9 @@ static int __devexit su_remove(struct of_device *dev)
         }
 
         if (up->port.membase)
-                of_iounmap(up->port.membase, up->reg_size);
+                of_iounmap(&op->resource[0], up->port.membase, up->reg_size);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
 
         return 0;
 }