Skip to contentSkip to conversation

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

PATCH In review Amol Lad 2 participants 4 messages Oct 6, 2006 Char and misc drivers

lore
Share & tools
lore

Amol Lad

author
#0 lore raw

PATCH 4/5 ioremap balanced with iounmap for drivers/char/rio/rio_linux.c

---
 rio_linux.c |    3 +++
 1 files changed, 3 insertions(+)

---

drivers/char/rio/rio_linux.c +3 -0
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/drivers/char/rio/rio_linux.c linux-2.6.19-rc1/drivers/char/rio/rio_linux.c
@@ -1181,6 +1181,9 @@ 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 (misc_deregister(&rio_fw_device) < 0) {
#1 lore raw

Ar Gwe, 2006-10-06 am 10:27 +0530, ysgrifennodd Amol Lad:

Quoted 9 lines
---
 rio_linux.c |    3 +++
 1 files changed, 3 insertions(+)

---
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/drivers/char/rio/rio_linux.c linux-2.6.19-rc1/drivers/char/rio/rio_linux.c

drivers/char/rio/rio_linux.c static void __exit rio_exit(void) · line 1187

Quoted 7 lines
drivers/char/rio/rio_linux.c +3 -0
@@ -1181,6 +1181,9 @@ 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);
 	}

I don't think this is sufficient because it may be unmapped earlier on error but hp->Caddr is not then cleared .

author
#2 lore raw
Quoted 7 lines

Review

Quoted 4 lines
(quoted diff) +3 -0
+
+		if (hp->Caddr)
+			iounmap(hp->Caddr);
 	}

I don't think this is sufficient because it may be unmapped earlier on error but hp->Caddr is not then cleared .

Is this fine ?

---
 rio_linux.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

---

drivers/char/rio/rio_linux.c +8 -1
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/drivers/char/rio/rio_linux.c linux-2.6.19-rc1/drivers/char/rio/rio_linux.c
@@ -1022,6 +1022,7 @@ static int __init rio_init(void)
 			found++;
 		} else {
 			iounmap(p->RIOHosts[p->RIONumHosts].Caddr);
+			p->RIOHosts[p->RIONumHosts].Caddr = NULL;
 		}
 	}
 
@@ -1071,6 +1072,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");
@@ -1110,8 +1112,10 @@ static int __init rio_init(void)
 				}
 			}
 
-			if (!okboard)
+			if (!okboard) {
 				iounmap(hp->Caddr);
+				hp->Caddr = NULL;
+			}
 		}
 	}
 
@@ -1181,6 +1185,9 @@ 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 (misc_deregister(&rio_fw_device) < 0) {
Acked-by
#3 lore raw

Ar Gwe, 2006-10-06 am 16:51 +0530, ysgrifennodd Amol Lad:

Quoted 11 lines
Quoted 7 lines

drivers/char/rio/rio_linux.c static void __exit rio_exit(void) · line 1191

Quoted 4 lines
drivers/char/rio/rio_linux.c +3 -0
+
+		if (hp->Caddr)
+			iounmap(hp->Caddr);
 	}

I don't think this is sufficient because it may be unmapped earlier on error but hp->Caddr is not then cleared .

Is this fine ?

Thanks