From patchwork Mon Oct 24 11:30:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8583 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp419104wru; Mon, 24 Oct 2022 05:15:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5NLtFPrGybaeAwpretHYGDBg1LBSFh8OmIN6m0HOs5u8tHRvkUSWleOOXg2otp1hEeXBS9 X-Received: by 2002:a17:907:7704:b0:780:da38:4480 with SMTP id kw4-20020a170907770400b00780da384480mr27345274ejc.64.1666613745898; Mon, 24 Oct 2022 05:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613745; cv=none; d=google.com; s=arc-20160816; b=fDCWtO5YcQTcz2q75cvISWL2H6iWdeUlt9rQZdFkxq58iGeLDf2WVWiu+9rn+isnQd NKYZ+xtUHrb50YHjAEQhbQGnINCo8BmmEMKda9/BpGhwFXorqjUKTW4kDA6QjCgdB3jS JSClD9NgSMKCLfc8Sg6reFZPZ13hksR5dwyCWmax03OqTZK8XWz9zjGQUy2XQXRcgwuw aPPktdadUmR4/lZPCnYaGdzNzg3N9hp+l7p7sel15xYRfZ9CWF8NyDv84BwVbViDBlc/ OOgk5H/A7aAURTmcQJdkh9B3OEoh3zMuX8AskK2ADgapTLwJi7x1czT1ZHXBdY/EAcaP 6GHw== 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=cTaKOMTpgM4IMkGXR8tm7Ux2EjWsBdh6cOYuQmE+bs8=; b=RG2SPGApr11Xgopoq7WZhp9LffkGNm5yGmkJPc3G7h2c2l3W21wMsFwgGKx7dNkTIa sxc4OoQtdqgbc9KWTmtn1iMpCPeGhnm9QV2k9qvb0FyyKeUb1yKCrmcHREviePZ2I+fN vlpwrM9GvLs/meZXY8rw8r0VHENvrHLtYLrClIpKDAhXkxSke+MeaadkN4KwC6kY8QEi l6tC+N6OWCoKvS0k0Ky/984cugbmJ2iGTmf/1rdzcVm+B8RswSpTWJ7mep59ObnarrHm hWMntgSOPiT3uKHt6j+Mtm2pHmBelIYNHcr689wFoUVdI2epHzo1x+JujS209tV3yOyA lORA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="qV/oBaUf"; 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 dt2-20020a170906b78200b00782b2a97827si24829210ejb.242.2022.10.24.05.15.21; Mon, 24 Oct 2022 05:15:45 -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="qV/oBaUf"; 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 S232670AbiJXMGg (ORCPT + 99 others); Mon, 24 Oct 2022 08:06:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232836AbiJXME0 (ORCPT ); Mon, 24 Oct 2022 08:04:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B6C065248; Mon, 24 Oct 2022 04:50:39 -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 ams.source.kernel.org (Postfix) with ESMTPS id 45AE8B811A5; Mon, 24 Oct 2022 11:49:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99E80C433D6; Mon, 24 Oct 2022 11:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612155; bh=HCgnyLFXNJ666+RLJs53imFRVFNh+zNwO7IvWGDTFNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qV/oBaUf02cSNeWOp6nTCmkkHmB34D9B799Zoprr8AFCS5eJseFggp/xdhWG4vtb1 rfycsL4umxZIaOGL5vSXMOAFGXr3VfflDKo/xFadZx/z9+KhmaTvqJdtti5xj9/wBZ K/Bw/loYnnNMS/kH0h2UhibdXtY4+59c3VvE2SKU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Qilong , Mark Brown , Sasha Levin Subject: [PATCH 4.14 090/210] spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe Date: Mon, 24 Oct 2022 13:30:07 +0200 Message-Id: <20221024112959.961616265@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747571175217832536?= X-GMAIL-MSGID: =?utf-8?q?1747571175217832536?= From: Zhang Qilong [ Upstream commit 29f65f2171c85a9633daa380df14009a365f42f2 ] The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. Fixes:db91841b58f9a ("spi/omap100k: Convert to runtime PM") Signed-off-by: Zhang Qilong Link: https://lore.kernel.org/r/20220924121310.78331-4-zhangqilong3@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-omap-100k.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 2eeb0fe2eed2..022f5bccef81 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c @@ -425,6 +425,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev) return status; err_fck: + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(spi100k->fck); err_ick: clk_disable_unprepare(spi100k->ick);