Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / drivers / mcb / mcb-parse.c

diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c
index d1278b5f3028dbc765f0da3fef90f0e99894170c..b0155b05cddb63a734e752e6cafe83e5d571b660 100644 (file)
--- a/drivers/mcb/mcb-parse.c
+++ b/drivers/mcb/mcb-parse.c
@@ -57,7 +57,7 @@ static int chameleon_parse_gdd(struct mcb_bus *bus,
        mdev->id = GDD_DEV(reg1);
        mdev->rev = GDD_REV(reg1);
        mdev->var = GDD_VAR(reg1);
-       mdev->bar = GDD_BAR(reg1);
+       mdev->bar = GDD_BAR(reg2);
        mdev->group = GDD_GRP(reg2);
        mdev->inst = GDD_INS(reg2);
 
@@ -141,6 +141,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase,
                default:
                        pr_err("Invalid chameleon descriptor type 0x%x\n",
                                dtype);
+                       kfree(header);
                        return -EINVAL;
                }
                num_cells++;