From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 11 Feb 2014 12:22:05 +0000 From: Lee Jones To: Krzysztof Kozlowski Cc: Sangbeom Kim , Samuel Ortiz , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Kyungmin Park , Marek Szyprowski , Bartlomiej Zolnierkiewicz , stable@vger.kernel.org Subject: Re: [PATCH 2/7] mfd: 88pm860x: Fix I2C device resource leak on regmap init fail Message-ID: <20140211122205.GQ32042@lee--X1> References: <1392113015-11180-1-git-send-email-k.kozlowski@samsung.com> <1392113015-11180-2-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: <1392113015-11180-2-git-send-email-k.kozlowski@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: On Tue, 11 Feb 2014, Krzysztof Kozlowski wrote: > During probe the driver allocates dummy I2C device for companion chip > and then allocates a regmap for it. If regmap_init_i2c() fails then the > I2C driver (allocated with i2c_new_dummy()) is not freed and this > resource leaks. > > Signed-off-by: Krzysztof Kozlowski > Cc: stable@vger.kernel.org > --- > drivers/mfd/88pm860x-core.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c > index e456be9a7c67..bcfc9e85b4a0 100644 > --- a/drivers/mfd/88pm860x-core.c > +++ b/drivers/mfd/88pm860x-core.c > @@ -1190,6 +1190,7 @@ static int pm860x_probe(struct i2c_client *client, > ret = PTR_ERR(chip->regmap_companion); > dev_err(&chip->companion->dev, > "Failed to allocate register map: %d\n", ret); > + i2c_unregister_device(chip->companion); > return ret; > } > i2c_set_clientdata(chip->companion, chip); Applied, thanks. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog