From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C5EFC433ED for ; Mon, 20 Jul 2020 16:01:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7128020684 for ; Mon, 20 Jul 2020 16:01:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260895; bh=03I4/cVaQmrkswviRdPNtFlcOl81leKqOafE+i78oiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SVdfx9+8+Tt7KFFOxkx820aeryJKYcJy9aH2/wWlCw2x3mQo+iaKtvySPNhr1sgLg SVHOUuMz4+u50XFKz5KBeOFP4tBS7ZAshFTwTMH8qamOqpZlNVIU6CmOQFID4YKa9P RJCy1rBEHp0wzUxo9aPrJr0YkFT5dLBl5SE1ZYLY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732539AbgGTQBc (ORCPT ); Mon, 20 Jul 2020 12:01:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731073AbgGTQBb (ORCPT ); Mon, 20 Jul 2020 12:01:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB2CA22D02; Mon, 20 Jul 2020 16:01:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260891; bh=03I4/cVaQmrkswviRdPNtFlcOl81leKqOafE+i78oiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ml2gD/BY151+vHRu4tfPq0IXBVue0DurRlWpJ20mbeDm6LCwOlLadc1MoheuaV5Nk EQUdA3i3Fo3CoKWF61fRXyYys+GLFPqlSIqURVOHujeabutsYeUgWoElbCihZCVWbP gPP6p6paizZ/aPOGkfXtvNrFLTgyC1lozFOMt8Q8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Renato Lui Geh , Jonathan Cameron , Sasha Levin Subject: [PATCH 5.4 102/215] iio: adc: ad7780: Fix a resource handling path in ad7780_probe() Date: Mon, 20 Jul 2020 17:36:24 +0200 Message-Id: <20200720152825.059287518@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET [ Upstream commit b0536f9826a5ed3328d527b4fc1686867a9f3041 ] If 'ad7780_init_gpios()' fails, we must not release some resources that have not been allocated yet. Return directly instead. Fixes: 5bb30e7daf00 ("staging: iio: ad7780: move regulator to after GPIO init") Fixes: 9085daa4abcc ("staging: iio: ad7780: add gain & filter gpio support") Signed-off-by: Christophe JAILLET Acked-by: Renato Lui Geh Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/adc/ad7780.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/adc/ad7780.c b/drivers/iio/adc/ad7780.c index 217a5a5c3c6d9..7e741294de7b8 100644 --- a/drivers/iio/adc/ad7780.c +++ b/drivers/iio/adc/ad7780.c @@ -309,7 +309,7 @@ static int ad7780_probe(struct spi_device *spi) ret = ad7780_init_gpios(&spi->dev, st); if (ret) - goto error_cleanup_buffer_and_trigger; + return ret; st->reg = devm_regulator_get(&spi->dev, "avdd"); if (IS_ERR(st->reg)) -- 2.25.1