Skip to contentSkip to conversation

i.MX6: fix cleanup path in imx6q_suspend_init()

PATCH New Jean-Christophe Dubois 3 participants 4 messages Dec 26, 2015 – Jan 28, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Jean-Christophe Dubois

author
#0 lore raw

PATCH 1/1 i.MX6: fix cleanup path in imx6q_suspend_init()

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

Signed-off-by Jean-Christophe Dubois <[email protected]>
---
 arch/arm/mach-imx/pm-imx6.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-imx/pm-imx6.c +4 -4
index 4470376..58924b3 100644
@@ -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);
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 1/1 i.MX6: fix cleanup path in imx6q_suspend_init()

Shawn, Sascha,

Are you OK with this patch?

JC

Le 26/12/2015 23:16, Jean-Christophe Dubois a ?crit :

Quoted 29 lines

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

Signed-off-by Jean-Christophe Dubois <[email protected]>
---
  arch/arm/mach-imx/pm-imx6.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-imx/pm-imx6.c +4 -4
index 4470376..58924b3 100644
@@ -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 lore raw

PATCH 1/1 i.MX6: fix cleanup path in imx6q_suspend_init()

Am Sonntag, den 17.01.2016, 18:53 +0100 schrieb Jean-Christophe DUBOIS:

Quoted 6 lines

Shawn, Sascha,

Are you OK with this patch?

JC

Looks good.

Reviewed-by Lucas Stach <[email protected]>
Quoted 32 lines

Le 26/12/2015 23:16, Jean-Christophe Dubois a ?crit :

Quoted 29 lines

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

Signed-off-by Jean-Christophe Dubois <[email protected]>
---
  arch/arm/mach-imx/pm-imx6.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-imx/pm-imx6.c +4 -4
index 4470376..58924b3 100644
@@ -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);
Signature · 2 lines
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |