From patchwork Sat Oct 22 07:22:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1095513wrr; Sat, 22 Oct 2022 01:02:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5t+LyytPuI2UggzstujfHRw70qgaxs2XXCB+rlls3cspwvpiNHShcSdRp4VBmYrFIIpV8c X-Received: by 2002:a17:902:d4c7:b0:186:8cda:c9c3 with SMTP id o7-20020a170902d4c700b001868cdac9c3mr1131715plg.154.1666425771558; Sat, 22 Oct 2022 01:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425771; cv=none; d=google.com; s=arc-20160816; b=P/JjDz0k/OOd4B0GOIYKPdzatHZRk8CCtTxuFy3nmcQvfoMhqAcfZoNnxm6C+kebp4 IHvBBufesllaJSAMg6c7WIHT5TDBl79PKyDUoI1Du7B7KfmsvjraByOVLlLK1o6xRKwd OTthEibwnsfniViByFmLs8KkrP0R//OP2tQVReJVBnwm3kmk9Amf4dCK9N4WbDNjFax7 jFrAMu5hRebmIsUn7HoXQH1yb/ewzxXGgr16s4CTDHCCcSjQvi99WvRgKnR4G/ROq6Kd 8+e10jLwpzcl1Rik7ieJT67MAh7vvBYri/3JIJxksqYYQk1obZhnYmMb37roplQ7a4to ac3g== 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=AvkYwu7Y3jkvZ6alWLtfagXvYipmN3O5BMvV5lnyp0g=; b=oOj6kkrNaaowmq8MHE/Z/zzdKpKwLEkepBJivwO7ctnJ3o+rxBb6Aq4+meqZRRz3Zx LHG4+KUhZAT5KhVbVlQVW+TIwejO4+5rZb6Qlf3GtpqTWQEiKqRHLIYuDZ1KI7zZpiMr ZtnriHm9cVks05U89SbW6mA+O/nowkQpYDSaHUvfZelFCUCau1wPhaDCs4fyz5eD3Yxj zvjds5E820plgZgnU2vuCBYm19r89vySfDW+326vZZ/29657FLdJ6jcczxWOSYUoebPh bruAbFdK+3gujeFE0zfRIe8PbIUm8pKfMK95o9yzX9vXQbzQngWL4Rj4ogPBSaVTAUok meCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AJyJD069; 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 jd4-20020a170903260400b0018668e41784si6572399plb.13.2022.10.22.01.02.38; Sat, 22 Oct 2022 01:02:51 -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=AJyJD069; 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 S232552AbiJVICW (ORCPT + 99 others); Sat, 22 Oct 2022 04:02:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232255AbiJVHyc (ORCPT ); Sat, 22 Oct 2022 03:54:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84ED5951D6; Sat, 22 Oct 2022 00:47:26 -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 C611760AD9; Sat, 22 Oct 2022 07:47:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D83DDC433D6; Sat, 22 Oct 2022 07:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424844; bh=qfRkPOfBXEFDRbBTB/Q/Jpv5q9piXIqG1CnSctn/W4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AJyJD069eW1hzVnFRd0wBO4vKT3l0kgQwzoTNLp84D8yS7FeS0af/Lm6YPdxq4Snr E9hBXLyEtVKEpbKSyuQ99TsIaVT326lc4LgxIEHa58rDuWyYoQu86+JbbxrGVu+9Mk RLrR1J98JIycmvc1+QJpmMv5peJQCXuyxiezY+ZQ= 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 5.19 267/717] spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe Date: Sat, 22 Oct 2022 09:22:26 +0200 Message-Id: <20221022072501.681024657@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747374069939970326?= X-GMAIL-MSGID: =?utf-8?q?1747374069939970326?= 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 20b047172965..061f7394e5b9 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c @@ -412,6 +412,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);