* [PATCH] ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed
@ 2014-01-20 14:59 Gregory CLEMENT
2014-01-20 20:16 ` Jason Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Gregory CLEMENT @ 2014-01-20 14:59 UTC (permalink / raw)
To: linux-arm-kernel
When pci_base is accessed whereas it has not been properly mapped by
of_iomap() the kernel hang. The check of this pointer made an improper
use of IS_ERR() instead of comparing to NULL. This patch fix this
issue.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Reported-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
Jason,
As this is a fix on a fix which should be ported to the stable branch, I
don't know how to handle the cc:stable flag
arch/arm/mach-mvebu/mvebu-soc-id.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/mvebu-soc-id.c b/arch/arm/mach-mvebu/mvebu-soc-id.c
index fe4fc1cbdfaf..f3b325f6cbd4 100644
--- a/arch/arm/mach-mvebu/mvebu-soc-id.c
+++ b/arch/arm/mach-mvebu/mvebu-soc-id.c
@@ -88,7 +88,7 @@ static int __init mvebu_soc_id_init(void)
}
pci_base = of_iomap(child, 0);
- if (IS_ERR(pci_base)) {
+ if (pci_base == NULL) {
pr_err("cannot map registers\n");
ret = -ENOMEM;
goto res_ioremap;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed
2014-01-20 14:59 [PATCH] ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed Gregory CLEMENT
@ 2014-01-20 20:16 ` Jason Cooper
0 siblings, 0 replies; 2+ messages in thread
From: Jason Cooper @ 2014-01-20 20:16 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 20, 2014 at 03:59:50PM +0100, Gregory CLEMENT wrote:
> When pci_base is accessed whereas it has not been properly mapped by
> of_iomap() the kernel hang. The check of this pointer made an improper
> use of IS_ERR() instead of comparing to NULL. This patch fix this
> issue.
>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Reported-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
> Jason,
>
> As this is a fix on a fix which should be ported to the stable branch, I
> don't know how to handle the cc:stable flag
No problem, I added it.
> arch/arm/mach-mvebu/mvebu-soc-id.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to mvebu/fixes.
thx,
Jason.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-20 20:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-20 14:59 [PATCH] ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed Gregory CLEMENT
2014-01-20 20:16 ` Jason Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox