diff --git a/[refs] b/[refs] index cef90a969216..5f98bea0d9ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c7be7d385f4911895877e0f0697c598f600136f +refs/heads/master: 43d80439c5f619446e174abdbdaff4fc0e539546 diff --git a/trunk/drivers/ps3/system-bus.c b/trunk/drivers/ps3/system-bus.c index d79f949bcb2a..468bdbcc722c 100644 --- a/trunk/drivers/ps3/system-bus.c +++ b/trunk/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; }