[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>

diff --git a/drivers/ps3/system-bus.c b/drivers/ps3/system-bus.c
index d79f949bcb2aa9ef068da94dd8d71a91fb758e2a..468bdbcc722cfa44371df6c7f5d4d0af4ffffdb7 100644 (file)
--- 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;
 }