2006-10-06 04:54:27

by Amol Lad

Subject: [PATCH 4/5] ioremap balanced with iounmap for drivers/char/rio/rio_linux.c

Signed-off-by: Amol Lad <[email protected]>
---
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
--- linux-2.6.19-rc1-orig/drivers/char/rio/rio_linux.c 2006-10-05 14:00:43.000000000 +0530
+++ linux-2.6.19-rc1/drivers/char/rio/rio_linux.c 2006-10-05 14:50:00.000000000 +0530
@@ -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) {

2006-10-06 10:56:11

by Alan

Subject: Re: [PATCH 4/5] ioremap balanced with iounmap for drivers/char/rio/rio_linux.c

Ar Gwe, 2006-10-06 am 10:27 +0530, ysgrifennodd Amol Lad:
> Signed-off-by: Amol Lad <[email protected]>
> ---
> 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
> --- linux-2.6.19-rc1-orig/drivers/char/rio/rio_linux.c 2006-10-05 14:00:43.000000000 +0530
> +++ linux-2.6.19-rc1/drivers/char/rio/rio_linux.c 2006-10-05 14:50:00.000000000 +0530
> @@ -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 .

2006-10-06 11:17:47

by Amol Lad

Subject: Re: [PATCH 4/5] ioremap balanced with iounmap for drivers/char/rio/rio_linux.c

> > +
> > + 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 ?

Signed-off-by: Amol Lad <[email protected]>
---
rio_linux.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletion(-)
---
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
--- linux-2.6.19-rc1-orig/drivers/char/rio/rio_linux.c 2006-10-05 14:00:43.000000000 +0530
+++ linux-2.6.19-rc1/drivers/char/rio/rio_linux.c 2006-10-06 16:42:19.000000000 +0530
@@ -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) {

2006-10-06 13:37:42

by Alan

Subject: Re: [PATCH 4/5] ioremap balanced with iounmap for drivers/char/rio/rio_linux.c

Ar Gwe, 2006-10-06 am 16:51 +0530, ysgrifennodd Amol Lad:
> > > +
> > > + 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 ?
>
> Signed-off-by: Amol Lad <[email protected]>

Acked-by: Alan Cox <[email protected]>

Thanks