From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 12 Feb 2014 09:58:28 +0000 From: Lee Jones To: Krzysztof Kozlowski Cc: Samuel Ortiz , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] mfd: 88pm800: Fix I2C device resource leak if probe fails Message-ID: <20140212095828.GW15081@lee--X1> References: <1392198701-20547-1-git-send-email-k.kozlowski@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1392198701-20547-1-git-send-email-k.kozlowski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: > During probe the driver allocates two dummy I2C devices for subchips in > function pm800_pages_init(). Additionally this function allocates > regmaps for these subchips. If any of these steps fail then these dummy > I2C devices are not freed and resources leak. > > On pm800_pages_init() fail the driver must call pm800_pages_exit() to > unregister dummy I2C devices. > > Signed-off-by: Krzysztof Kozlowski > Cc: stable@vger.kernel.org > --- > drivers/mfd/88pm800.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c > index 7dca1e640970..28627c1ff9da 100644 > --- a/drivers/mfd/88pm800.c > +++ b/drivers/mfd/88pm800.c > @@ -586,8 +586,8 @@ static int pm800_probe(struct i2c_client *client, > return 0; > > err_device_init: > - pm800_pages_exit(chip); > err_page_init: > + pm800_pages_exit(chip); > err_subchip_alloc: > pm80x_deinit(); > out_init: If you're going to do this, then can you clean-up the superfluous goto labels please? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog