The patch titled lis3: free regulators if probe() fails has been added to the -mm tree. Its filename is lis3-free-regulators-if-probe-fails.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: lis3: free regulators if probe() fails From: Éric Piel <eric.piel@xxxxxxxxxxxxxxxx> Signed-off-by: Ilkka Koskinen <ilkka.koskinen@xxxxxxxxx> Signed-off-by: Éric Piel <eric.piel@xxxxxxxxxxxxxxxx> Cc: Matthew Garrett <mjg@xxxxxxxxxx> Cc: Witold Pilat <witold.pilat@xxxxxxxxx> Cc: Lyall Pearce <lyall.pearce@xxxxxx> Cc: Malte Starostik <m-starostik@xxxxxxxxxxx> Cc: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx> Cc: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff -puN drivers/misc/lis3lv02d/lis3lv02d_i2c.c~lis3-free-regulators-if-probe-fails drivers/misc/lis3lv02d/lis3lv02d_i2c.c --- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c~lis3-free-regulators-if-probe-fails +++ a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c @@ -161,8 +161,13 @@ static int __devinit lis3lv02d_i2c_probe if (lis3_dev.reg_ctrl) lis3_reg_ctrl(&lis3_dev, LIS3_REG_OFF); - if (ret == 0) - return 0; + if (ret) + goto fail2; + return 0; + +fail2: + regulator_bulk_free(ARRAY_SIZE(lis3_dev.regulators), + lis3_dev.regulators); fail: if (pdata && pdata->release_resources) pdata->release_resources(); _ Patches currently in -mm which might be from eric.piel@xxxxxxxxxxxxxxxx are lis3lv02d-avoid-divide-by-zero-due-to-unchecked.patch lis3-update-maintainer-information.patch lis3-add-support-for-hp-elitebook-2730p.patch lis3-add-support-for-hp-elitebook-8540w.patch hp_accel-add-hp-probook-655x.patch config_hp_accel-fix-help-text.patch lis3-free-regulators-if-probe-fails.patch lis3-change-naming-to-consistent.patch lis3-change-exported-function-to-use-given.patch lis3-remove-the-references-to-the-global-variable-in-core-driver.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html