fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / serial / 8250_acorn.c

diff --git a/drivers/serial/8250_acorn.c b/drivers/serial/8250_acorn.c
index 32af365..ef8cc8a 100644 (file)
--- a/drivers/serial/8250_acorn.c
+++ b/drivers/serial/8250_acorn.c
@@ -35,6 +35,7 @@ struct serial_card_type {
 struct serial_card_info {
        unsigned int    num_ports;
        int             ports[MAX_PORTS];
+       void __iomem *vaddr;
 };
 
 static int __devinit
@@ -44,7 +45,6 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
        struct serial_card_type *type = id->data;
        struct uart_port port;
        unsigned long bus_addr;
-       unsigned char __iomem *virt_addr;
        unsigned int i;
 
        info = kmalloc(sizeof(struct serial_card_info), GFP_KERNEL);
@@ -55,8 +55,8 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
        info->num_ports = type->num_ports;
 
        bus_addr = ecard_resource_start(ec, type->type);
-       virt_addr = ioremap(bus_addr, ecard_resource_len(ec, type->type));
-       if (!virt_addr) {
+       info->vaddr = ioremap(bus_addr, ecard_resource_len(ec, type->type));
+       if (!info->vaddr) {
                kfree(info);
                return -ENOMEM;
        }
@@ -72,7 +72,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
        port.dev        = &ec->dev;
 
        for (i = 0; i < info->num_ports; i ++) {
-               port.membase = virt_addr + type->offset[i];
+               port.membase = info->vaddr + type->offset[i];
                port.mapbase = bus_addr + type->offset[i];
 
                info->ports[i] = serial8250_register_port(&port);
@@ -92,6 +92,7 @@ static void __devexit serial_card_remove(struct expansion_card *ec)
                if (info->ports[i] > 0)
                        serial8250_unregister_port(info->ports[i]);
 
+       iounmap(info->vaddr);
        kfree(info);
 }