33 lines
984 B
Diff
33 lines
984 B
Diff
|
From f8ea60bbaf880d8d8d99fde3b5155f472e00141f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Date: Mon, 12 May 2014 20:16:39 +0200
|
||
|
|
Subject: [PATCH 09/15] bcma: only map wrap if it is not null
|
||
|
|
|
||
|
|
The chipcommon B core does not have a wrap address and it would fail here.
|
||
|
|
|
||
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
---
|
||
|
|
drivers/bcma/scan.c | 11 +++++++----
|
||
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/bcma/scan.c
|
||
|
|
+++ b/drivers/bcma/scan.c
|
||
|
|
@@ -421,10 +421,13 @@ static int bcma_get_next_core(struct bcm
|
||
|
|
core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
|
||
|
|
if (!core->io_addr)
|
||
|
|
return -ENOMEM;
|
||
|
|
- core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);
|
||
|
|
- if (!core->io_wrap) {
|
||
|
|
- iounmap(core->io_addr);
|
||
|
|
- return -ENOMEM;
|
||
|
|
+ if (core->wrap) {
|
||
|
|
+ core->io_wrap = ioremap_nocache(core->wrap,
|
||
|
|
+ BCMA_CORE_SIZE);
|
||
|
|
+ if (!core->io_wrap) {
|
||
|
|
+ iounmap(core->io_addr);
|
||
|
|
+ return -ENOMEM;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
return 0;
|