| Message ID | 1529632343-70907-1-git-send-email-jiazhouyang09@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Boris Brezillon |
| Headers | show |
| Series | [v2] mtd: gpio_flash: add error handling for ioremap_nocache | expand |
On Fri, 22 Jun 2018 09:52:20 +0800 Zhouyang Jia <jiazhouyang09@gmail.com> wrote: > When ioremap_nocache fails, the lack of error-handling code may > cause unexpected results. > > This patch adds error-handling code after calling ioremap_nocache. > > Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com> Applied. Thanks, Boris > --- > v1->v2: > - Move the test just after the ioremap_nocache() call. > --- > drivers/mtd/maps/gpio-addr-flash.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c > index 385305e..9d97236 100644 > --- a/drivers/mtd/maps/gpio-addr-flash.c > +++ b/drivers/mtd/maps/gpio-addr-flash.c > @@ -239,6 +239,9 @@ static int gpio_flash_probe(struct platform_device *pdev) > state->map.bankwidth = pdata->width; > state->map.size = state->win_size * (1 << state->gpio_count); > state->map.virt = ioremap_nocache(memory->start, state->map.size); > + if (!state->map.virt) > + return -ENOMEM; > + > state->map.phys = NO_XIP; > state->map.map_priv_1 = (unsigned long)state; >
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c index 385305e..9d97236 100644 --- a/drivers/mtd/maps/gpio-addr-flash.c +++ b/drivers/mtd/maps/gpio-addr-flash.c @@ -239,6 +239,9 @@ static int gpio_flash_probe(struct platform_device *pdev) state->map.bankwidth = pdata->width; state->map.size = state->win_size * (1 << state->gpio_count); state->map.virt = ioremap_nocache(memory->start, state->map.size); + if (!state->map.virt) + return -ENOMEM; + state->map.phys = NO_XIP; state->map.map_priv_1 = (unsigned long)state;
When ioremap_nocache fails, the lack of error-handling code may cause unexpected results. This patch adds error-handling code after calling ioremap_nocache. Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com> --- v1->v2: - Move the test just after the ioremap_nocache() call. --- drivers/mtd/maps/gpio-addr-flash.c | 3 +++ 1 file changed, 3 insertions(+)