From patchwork Wed Oct 19 08:23:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4651 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp212433wrs; Wed, 19 Oct 2022 02:07:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7UE/HJsEaLNkJWQlcl3Yk0zF62bI8sLoyeSoezg6fAPG1ymHAuKHQFurVDAUa7OlSXEHXZ X-Received: by 2002:a17:906:478e:b0:78e:4b5:a547 with SMTP id cw14-20020a170906478e00b0078e04b5a547mr5909027ejc.81.1666170450024; Wed, 19 Oct 2022 02:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666170450; cv=none; d=google.com; s=arc-20160816; b=usAek6EGz3S76C9GnyPvrKLOnhidnpVwxM4dJo4Ws9tmf3avmClndq6vH84CGwPIYW XMwXgRwPxYGnNVF+jY9THJeAT0Qx6P+I09XJ7Ppsa8WutaJtOUgg1srEqmAunxFw12zb Mihf9FuSOUC/5NJ/kStk5OV/yy3UFcgCvwNy3iO4yb668Gif0A4sqxqYITMUqICKn9Qi vnv0NCaibPliV9xLqTd2Ooya4SD3/+nu6d4/6HQuDOp0VjUXqNBbjCCsOpUudHnjQi1N xAN2FYl4TlkuwrHsKmeVVTQwN/+V/MLx3TSrhv4mgQMh/dkYylL0WVTH23R2DTq9e4oF Zdqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gfxxX0aUX/pg6s0PohU/GMlYSATe2edQ4rb60JFnBQ4=; b=zgDuA/5e67gHI/u9GLQr9isOTyTHmpwkkpLRlEgEj9bVS8kYCk6njiyGjZFxeW3ueh Cp3+6SFfWiknXF44xen1I0G4IlT13/tjXhfPXmlchN9lC3yq52+ly9HUe/BOWZzCJKAp 11OfPM3W4HUODTTdcWR1ONbzmph+Njblgphq8lgL9d0wtNAUYl5PYSjes/wg5WULQLuz sYaDvJbeUhu42XaJAUSIEZ7LZFzGw+fr1CgJMq95ygACCsXM0RVxgzjq+6bOQMnrhcxb YrEdnvHlS3N4Hnle95z17nUAP5dn6ja6Cp9hiHmIK6JX++u3Q0OudP89uTVhOm5FHdNK alHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fBm4Ylx4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dm5-20020a170907948500b0078cff711da6si1892395ejc.976.2022.10.19.02.07.00; Wed, 19 Oct 2022 02:07:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fBm4Ylx4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232051AbiJSJAV (ORCPT + 99 others); Wed, 19 Oct 2022 05:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232008AbiJSI6e (ORCPT ); Wed, 19 Oct 2022 04:58:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70BB59E2D0; Wed, 19 Oct 2022 01:53:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4443B617F1; Wed, 19 Oct 2022 08:42:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AC25C433D6; Wed, 19 Oct 2022 08:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666168943; bh=D2jgQwQo364439T549ihHR/3+u5XK1iy4v8lN4klREE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fBm4Ylx46hZEGfW4lH7z6sypBXZ4npP5LnyTXil3/w8P/NBrVU5iXh3vjKHHUkRSp NNAM0CllbBRWsFNLw58GtPILutUi2INzseQOoMaMIssjNTpLNhIkywfwvY94PXy5ZR fd4R5x2XnL6WFLWJ74ZfPH9E8Vpu1jhK8fhj0wls= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Kozlowski , Srinivas Kandagatla Subject: [PATCH 6.0 104/862] slimbus: qcom-ngd: use correct error in message of pdr_add_lookup() failure Date: Wed, 19 Oct 2022 10:23:11 +0200 Message-Id: <20221019083254.513496073@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747106346206140615?= X-GMAIL-MSGID: =?utf-8?q?1747106346206140615?= From: Krzysztof Kozlowski commit 5038d21dde818fe74ba1fcb6f2cee35b8c2ebbf2 upstream. Use correct error code, instead of previous 'ret' value, when printing error from pdr_add_lookup() failure. Fixes: e1ae85e1830e ("slimbus: qcom-ngd-ctrl: add Protection Domain Restart Support") Cc: Signed-off-by: Krzysztof Kozlowski Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20220916122910.170730-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/slimbus/qcom-ngd-ctrl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1581,8 +1581,9 @@ static int qcom_slim_ngd_ctrl_probe(stru pds = pdr_add_lookup(ctrl->pdr, "avs/audio", "msm/adsp/audio_pd"); if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) { + ret = PTR_ERR(pds); dev_err(dev, "pdr add lookup failed: %d\n", ret); - return PTR_ERR(pds); + return ret; } platform_driver_register(&qcom_slim_ngd_driver);