diff options
| author | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2014-01-20 14:59:50 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-13 21:50:13 (GMT) |
| commit | 020043ee82cf6f8b61b76cb90af73818f66e9f60 (patch) | |
| tree | ad6134c06cd9281429d061c4e43aeafd1ea80ad7 /arch/arm | |
| parent | fd4042ce17f45dda46149a235a5e620bffbcafe6 (diff) | |
| download | linux-fsl-qoriq-020043ee82cf6f8b61b76cb90af73818f66e9f60.tar.xz | |
ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed
commit dc4910d9e93f8cc56b190dd8fc9e789135978216 upstream.
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>
Fixes: 930ab3d403ae (i2c: mv64xxx: Add I2C Transaction Generator support)
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mvebu/mvebu-soc-id.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/mvebu-soc-id.c b/arch/arm/mach-mvebu/mvebu-soc-id.c index fe4fc1c..f3b325f 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; |