| Message ID | 20161123234036.9985-1-henrix@camandro.org |
|---|---|
| State | Accepted |
| Commit | 3502fbcc25eb67db96fea35abe721c82aa1f4ff3 |
| Headers | show |
On 11/24/2016 12:40 AM, Luis Henriques wrote: > This patch was triggered by the following Coccinelle error: > > ./drivers/mtd/maps/sc520cdp.c:246:3-9: \ > ERROR: missing iounmap; ioremap on line 242 \ > and execution via conditional on line 244 > > Since do_map_probe() is also invoked in this loop, it is also necessary to > map_destroy() any initialised struct mtd_info. > > Signed-off-by: Luis Henriques <henrix@camandro.org> > --- > Changes since v1: > * Changes according to Brian Norris review: > - Ensure sc520cdp_map[0].virt is unmaped when needed > - Use a for loop instead of an 'if (i)' > - Prevent double-iounmap > * Added map_destroy() in the cleanup > > drivers/mtd/maps/sc520cdp.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c > index 093edd51bdc7..9b1c13aa9f20 100644 > --- a/drivers/mtd/maps/sc520cdp.c > +++ b/drivers/mtd/maps/sc520cdp.c > @@ -227,7 +227,7 @@ static void sc520cdp_setup_par(void) > > static int __init init_sc520cdp(void) > { > - int i, devices_found = 0; > + int i, j, devices_found = 0; > > #ifdef REPROGRAM_PAR > /* reprogram PAR registers so flash appears at the desired addresses */ > @@ -243,6 +243,12 @@ static int __init init_sc520cdp(void) > > if (!sc520cdp_map[i].virt) { > printk("Failed to ioremap_nocache\n"); > + for (j = 0; j < i; j++) { > + if (mymtd[j]) { > + map_destroy(mymtd[j]); > + iounmap(sc520cdp_map[j].virt); > + } > + } Reviewed-by: Marek Vasut <marek.vasut@gmail.com> > return -EIO; > } > >
On Fri, Nov 25, 2016 at 03:18:09PM +0100, Marek Vasut wrote: > On 11/24/2016 12:40 AM, Luis Henriques wrote: > > This patch was triggered by the following Coccinelle error: > > > > ./drivers/mtd/maps/sc520cdp.c:246:3-9: \ > > ERROR: missing iounmap; ioremap on line 242 \ > > and execution via conditional on line 244 > > > > Since do_map_probe() is also invoked in this loop, it is also necessary to > > map_destroy() any initialised struct mtd_info. > > > > Signed-off-by: Luis Henriques <henrix@camandro.org> > > --- > > Changes since v1: > > * Changes according to Brian Norris review: > > - Ensure sc520cdp_map[0].virt is unmaped when needed > > - Use a for loop instead of an 'if (i)' > > - Prevent double-iounmap > > * Added map_destroy() in the cleanup > > > > drivers/mtd/maps/sc520cdp.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) ... > Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Applied to l2-mtd.git
diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c index 093edd51bdc7..9b1c13aa9f20 100644 --- a/drivers/mtd/maps/sc520cdp.c +++ b/drivers/mtd/maps/sc520cdp.c @@ -227,7 +227,7 @@ static void sc520cdp_setup_par(void) static int __init init_sc520cdp(void) { - int i, devices_found = 0; + int i, j, devices_found = 0; #ifdef REPROGRAM_PAR /* reprogram PAR registers so flash appears at the desired addresses */ @@ -243,6 +243,12 @@ static int __init init_sc520cdp(void) if (!sc520cdp_map[i].virt) { printk("Failed to ioremap_nocache\n"); + for (j = 0; j < i; j++) { + if (mymtd[j]) { + map_destroy(mymtd[j]); + iounmap(sc520cdp_map[j].virt); + } + } return -EIO; }
This patch was triggered by the following Coccinelle error: ./drivers/mtd/maps/sc520cdp.c:246:3-9: \ ERROR: missing iounmap; ioremap on line 242 \ and execution via conditional on line 244 Since do_map_probe() is also invoked in this loop, it is also necessary to map_destroy() any initialised struct mtd_info. Signed-off-by: Luis Henriques <henrix@camandro.org> --- Changes since v1: * Changes according to Brian Norris review: - Ensure sc520cdp_map[0].virt is unmaped when needed - Use a for loop instead of an 'if (i)' - Prevent double-iounmap * Added map_destroy() in the cleanup drivers/mtd/maps/sc520cdp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)