aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2007-01-26 19:07:54 -0800
committerPaul Mackerras <paulus@samba.org>2007-02-07 14:03:17 +1100
commit43d80439c5f619446e174abdbdaff4fc0e539546 (patch)
tree8cf055ca91a1de67f6fda124ccb68e43ac28c8c5
parent6c7be7d385f4911895877e0f0697c598f600136f (diff)
downloadlinux-linaro-stable-43d80439c5f619446e174abdbdaff4fc0e539546.tar.gz
[POWERPC] ps3: system bus minor mmio fix
Fix two minor bugs in the PS3 system bus mmio region code. First, on error or when freeing a region, retain the bus_addr and len fields to allow subsequent calls to create the region. Second, correct the region address argument to the lv1_unmap_device_mmio_region() call. Fixes modprobe/rmmod of some drivers. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--drivers/ps3/system-bus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ps3/system-bus.c b/drivers/ps3/system-bus.c
index d79f949bcb2a..468bdbcc722c 100644
--- a/drivers/ps3/system-bus.c
+++ b/drivers/ps3/system-bus.c
@@ -50,7 +50,7 @@ int ps3_mmio_region_create(struct ps3_mmio_region *r)
if (result) {
pr_debug("%s:%d: lv1_map_device_mmio_region failed: %s\n",
__func__, __LINE__, ps3_result(result));
- r->lpar_addr = r->len = r->bus_addr = 0;
+ r->lpar_addr = 0;
}
dump_mmio_region(r);
@@ -62,13 +62,13 @@ int ps3_free_mmio_region(struct ps3_mmio_region *r)
int result;
result = lv1_unmap_device_mmio_region(r->did.bus_id, r->did.dev_id,
- r->bus_addr);
+ r->lpar_addr);
if (result)
pr_debug("%s:%d: lv1_unmap_device_mmio_region failed: %s\n",
__func__, __LINE__, ps3_result(result));
- r->lpar_addr = r->len = r->bus_addr = 0;
+ r->lpar_addr = 0;
return result;
}