diff options
author | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
commit | 3e93457b45a1a8c69227ce596ee2005fa06f20dd (patch) | |
tree | 248c27e432533b1af80a9b2240eaa8e48e3b87cc /drivers/mcb/mcb-parse.c | |
parent | 290414499cf94284a97cc3c33214d13ccfcd896a (diff) | |
parent | c42ba72ec3a7a1b6aa30122931f1f4b91b601c31 (diff) |
Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to 'drivers/mcb/mcb-parse.c')
-rw-r--r-- | drivers/mcb/mcb-parse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c index d1278b5f3028..004926955263 100644 --- a/drivers/mcb/mcb-parse.c +++ b/drivers/mcb/mcb-parse.c | |||
@@ -141,6 +141,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, | |||
141 | default: | 141 | default: |
142 | pr_err("Invalid chameleon descriptor type 0x%x\n", | 142 | pr_err("Invalid chameleon descriptor type 0x%x\n", |
143 | dtype); | 143 | dtype); |
144 | kfree(header); | ||
144 | return -EINVAL; | 145 | return -EINVAL; |
145 | } | 146 | } |
146 | num_cells++; | 147 | num_cells++; |