From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751956AbcF0PDg (ORCPT ); Mon, 27 Jun 2016 11:03:36 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38706 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770AbcF0PDf (ORCPT ); Mon, 27 Jun 2016 11:03:35 -0400 Date: Mon, 27 Jun 2016 16:04:24 +0100 From: Lee Jones To: Charles Keepax Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH] mfd: arizona: Add missing disable of PM runtime on probe error path Message-ID: <20160627150424.GA6720@dell> References: <1467037151-23765-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1467037151-23765-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 27 Jun 2016, Charles Keepax wrote: > Signed-off-by: Charles Keepax > --- > drivers/mfd/arizona-core.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index bf27179..e4f97b3 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -1462,7 +1462,7 @@ int arizona_dev_init(struct arizona *arizona) > /* Set up for interrupts */ > ret = arizona_irq_init(arizona); > if (ret != 0) > - goto err_reset; > + goto err_pm; > > pm_runtime_set_autosuspend_delay(arizona->dev, 100); > pm_runtime_use_autosuspend(arizona->dev); > @@ -1486,6 +1486,8 @@ int arizona_dev_init(struct arizona *arizona) > > err_irq: > arizona_irq_exit(arizona); > +err_pm: > + pm_runtime_disable(arizona->dev); > err_reset: > arizona_enable_reset(arizona); > regulator_disable(arizona->dcvdd); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog