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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 75F16C64E7C for ; Wed, 2 Dec 2020 20:36:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F3D5B21527 for ; Wed, 2 Dec 2020 20:36:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3D5B21527 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=S07USGcwUiiyrov/jXpZJSCCIKd79pOxiH5CtApzZzo=; b=f7ngDLgvssfy5yNLSLVOULLp8 2PEaDfgXSGasAFReNaixhR0UwFN+Db1p7GAtfwkqNjuJ4FKAeF6szjim93KeDysFZ+gOHUDM80CEl tCX//zwsjabeD/HAq/M8IiqTK6yFLCasa0yLTHdSbWoiPfG+unjTLepFANHV/DWZnKg5AVIei2YXf Cgwf7oB+2vmJgfu5S3Q8xLOesFV8nrKh+393dsp5iV9RoRAl/iPn1oGsrCp3/9MazrCxyutVBdukj jX2fZvLrKjJXmdDYyDwNbIit0oMH2/U0QqGMX4mXKAG1YgOLjKQyP1uPaDIObutAz9ig1GSnZAged B3oJx0tPA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkYqK-00013X-0E; Wed, 02 Dec 2020 20:35:16 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kkYqF-00012J-W3 for linux-arm-kernel@lists.infradead.org; Wed, 02 Dec 2020 20:35:13 +0000 Received: by mail-pj1-x1041.google.com with SMTP id v1so1690966pjr.2 for ; Wed, 02 Dec 2020 12:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=DJDfzlDfTnrfdlzBEpegCQHAti8FUO1LnfZw8Lau0fQ=; b=C+knjGEmhK41qutbbphKO4J4NrbDW26y9QH8+LHd7EvKLqHCEGkkZYe9M7SJC+NvAu YVrc7DgTKBl37RvOJxMjZviMbl7E+EEL0hdzztKsNBNyUl4s03BKBfhsul1YimNxANz1 LohNMAcwL1tVXDnsMGnR9Wrx42jw/NWJHx40rRZgoL6FKb2D2XDwDsivMHh8kQPh04QM iDcLelQl2Q7KQcZkUdPB816L6bCqkzZ8JGpC3PXzStS5bnsoubKMx+he6VaN80K1WtCF rOti1lK98j6v4q3HH2GbKZYf+misH2waveH8dqTNNS9Yzfbq+tlb8Jr2UihrwfAapKzX YEmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DJDfzlDfTnrfdlzBEpegCQHAti8FUO1LnfZw8Lau0fQ=; b=IYljje51IU9ji/lhCKiLTU1IBblpBbw5I/LQqxytDMQMXCdSN3iRxvLbn7C3bdZ0c9 yfwNBhvI4pCBCM4dA5QSl+u64cxT71bqmhfJmY0HLXs77U7flzWoy2z6vsrRYHtSs6Cx o0HuCwtxYoWCNc6pYt5AxHl37yUmzdKKkJI3wQLpXe0QQJh4OZr8ory0L7tHOtyGhdAP Pq3ZSGCoCAqyKEI6EhfSDINTq2LY61XEKVGkvit4Cth37rTTtCNaYThuZKiplR+4nQHj 5Ohax1DZbF8lc8i2E5qq4uV0ZWxQ4SfNz5D3pqtUvZaBTTxHkoXQbaTiOgIV4GZ4kuiz lJ1g== X-Gm-Message-State: AOAM533M58WDHa/Fm6zq/dTSU5JTNzC02TEwaxGoc9VuAaQlLWoxPdIJ vyUwhdeE8UBz5BpIpMEwJ5xtrg== X-Google-Smtp-Source: ABdhPJzMsAlGSS2amauxNUiGiVKwN3GZ0vcFO+QU6J+ByDlC0KcIIuBQu6P71TTmuB9sxoB2samOuA== X-Received: by 2002:a17:90a:bd16:: with SMTP id y22mr1465841pjr.203.1606941309922; Wed, 02 Dec 2020 12:35:09 -0800 (PST) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id b20sm553096pfi.218.2020.12.02.12.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 12:35:09 -0800 (PST) Date: Wed, 2 Dec 2020 13:35:07 -0700 From: Mathieu Poirier To: Tzung-Bi Shih Subject: Re: [PATCH] remoteproc/mediatek: unprepare clk if scp_before_load fails Message-ID: <20201202203507.GB1282360@xps15> References: <20201202044537.2500497-1-tzungbi@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201202044537.2500497-1-tzungbi@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201202_153512_233934_AA35F3BD X-CRM114-Status: GOOD ( 17.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ohad@wizery.com, linux-remoteproc@vger.kernel.org, bjorn.andersson@linaro.org, linux-mediatek@lists.infradead.org, pihsun@chromium.org, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Dec 02, 2020 at 12:45:37PM +0800, Tzung-Bi Shih wrote: > Fixes the error handling to unprepare clk if scp_before_load fails. > This requires a "Fixes:" tag. > Signed-off-by: Tzung-Bi Shih > --- > drivers/remoteproc/mtk_scp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index 5f42b9ce7185..c7d49c861adb 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -350,11 +350,11 @@ static int scp_load(struct rproc *rproc, const struct firmware *fw) > > ret = scp->data->scp_before_load(scp); > if (ret < 0) > - return ret; > + goto leave; > > ret = scp_elf_load_segments(rproc, fw); > +leave: > clk_disable_unprepare(scp->clk); > - Unneeded change Thanks, Mathieu > return ret; > } > > -- > 2.29.2.454.gaff20da3a2-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel