Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86842654 authored by Amol Lad's avatar Amol Lad Committed by Linus Torvalds
Browse files

[PATCH] ioremap balanced with iounmap for drivers/char/rio/rio_linux.c 



Signed-off-by: default avatarAmol Lad <amol@verismonetworks.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 238b8721

drivers/char/rio/rio_linux.c

+7 −1
Original line number Diff line number Diff line
@@ -1026,6 +1026,7 @@ static int __init rio_init(void) 
			found++;

		} else {

			iounmap(p->RIOHosts[p->RIONumHosts].Caddr);

			p->RIOHosts[p->RIONumHosts].Caddr = NULL;

		}

	}
@@ -1078,6 +1079,7 @@ static int __init rio_init(void) 
			found++;

		} else {

			iounmap(p->RIOHosts[p->RIONumHosts].Caddr);

			p->RIOHosts[p->RIONumHosts].Caddr = NULL;

		}

#else

		printk(KERN_ERR "Found an older RIO PCI card, but the driver is not " "compiled to support it.\n");
@@ -1117,8 +1119,10 @@ static int __init rio_init(void) 
				}

			}



			if (!okboard)

			if (!okboard) {

				iounmap(hp->Caddr);

				hp->Caddr = NULL;

			}

		}

	}
@@ -1188,6 +1192,8 @@ static void __exit rio_exit(void) 
		}

		/* It is safe/allowed to del_timer a non-active timer */

		del_timer(&hp->timer);

		if (hp->Caddr)

			iounmap(hp->Caddr);

		if (hp->Type == RIO_PCI)

			pci_dev_put(hp->pdev);

	}