[PATCH] [ARM] i.MX6: fix cleanup path in imx6q_suspend_init()

[PATCH] [ARM] i.MX6: fix cleanup path in imx6q_suspend_init()

[Jean-Christophe Dubois]

The wrong pointer is passed to the ioumap function in the cleanup path

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
---
 arch/arm/mach-imx/pm-imx6.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 4470376..58924b3 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -561,13 +561,13 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)
 	goto put_node;
 
 pl310_cache_map_failed:
-	iounmap(&pm_info->gpc_base.vbase);
+	iounmap(pm_info->gpc_base.vbase);
 gpc_map_failed:
-	iounmap(&pm_info->iomuxc_base.vbase);
+	iounmap(pm_info->iomuxc_base.vbase);
 iomuxc_map_failed:
-	iounmap(&pm_info->src_base.vbase);
+	iounmap(pm_info->src_base.vbase);
 src_map_failed:
-	iounmap(&pm_info->mmdc_base.vbase);
+	iounmap(pm_info->mmdc_base.vbase);
 put_node:
 	of_node_put(node);
 
-- 
2.5.0

[PATCH] [ARM] i.MX6: fix cleanup path in imx6q_suspend_init()

[Jean-Christophe DUBOIS]

Shawn, Sascha,

Are you OK with this patch?

JC

Le 26/12/2015 23:16, Jean-Christophe Dubois a ?crit :
> The wrong pointer is passed to the ioumap function in the cleanup path
>
> Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
> ---
>   arch/arm/mach-imx/pm-imx6.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
> index 4470376..58924b3 100644
> --- a/arch/arm/mach-imx/pm-imx6.c
> +++ b/arch/arm/mach-imx/pm-imx6.c
> @@ -561,13 +561,13 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)
>   	goto put_node;
>   
>   pl310_cache_map_failed:
> -	iounmap(&pm_info->gpc_base.vbase);
> +	iounmap(pm_info->gpc_base.vbase);
>   gpc_map_failed:
> -	iounmap(&pm_info->iomuxc_base.vbase);
> +	iounmap(pm_info->iomuxc_base.vbase);
>   iomuxc_map_failed:
> -	iounmap(&pm_info->src_base.vbase);
> +	iounmap(pm_info->src_base.vbase);
>   src_map_failed:
> -	iounmap(&pm_info->mmdc_base.vbase);
> +	iounmap(pm_info->mmdc_base.vbase);
>   put_node:
>   	of_node_put(node);
>   

[PATCH] [ARM] i.MX6: fix cleanup path in imx6q_suspend_init()

[Lucas Stach]

Am Sonntag, den 17.01.2016, 18:53 +0100 schrieb Jean-Christophe DUBOIS:
> Shawn, Sascha,
> 
> Are you OK with this patch?
> 
> JC
> 
Looks good.
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

> Le 26/12/2015 23:16, Jean-Christophe Dubois a ?crit :
> > The wrong pointer is passed to the ioumap function in the cleanup path
> >
> > Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
> > ---
> >   arch/arm/mach-imx/pm-imx6.c | 8 ++++----
> >   1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
> > index 4470376..58924b3 100644
> > --- a/arch/arm/mach-imx/pm-imx6.c
> > +++ b/arch/arm/mach-imx/pm-imx6.c
> > @@ -561,13 +561,13 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)
> >   	goto put_node;
> >   
> >   pl310_cache_map_failed:
> > -	iounmap(&pm_info->gpc_base.vbase);
> > +	iounmap(pm_info->gpc_base.vbase);
> >   gpc_map_failed:
> > -	iounmap(&pm_info->iomuxc_base.vbase);
> > +	iounmap(pm_info->iomuxc_base.vbase);
> >   iomuxc_map_failed:
> > -	iounmap(&pm_info->src_base.vbase);
> > +	iounmap(pm_info->src_base.vbase);
> >   src_map_failed:
> > -	iounmap(&pm_info->mmdc_base.vbase);
> > +	iounmap(pm_info->mmdc_base.vbase);
> >   put_node:
> >   	of_node_put(node);
> >   
> 
> 

-- 
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |

[PATCH] [ARM] i.MX6: fix cleanup path in imx6q_suspend_init()

[Shawn Guo]

On Sun, Jan 17, 2016 at 06:53:05PM +0100, Jean-Christophe DUBOIS wrote:
> Shawn, Sascha,
> 
> Are you OK with this patch?
> 
> JC
> 
> Le 26/12/2015 23:16, Jean-Christophe Dubois a ?crit :
> >The wrong pointer is passed to the ioumap function in the cleanup path
> >
> >Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

Applied, thanks.