Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2028169iob; Thu, 5 May 2022 13:45:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrXDLMnlQIp5qA8NlUxHqO5RFDtFoJQFtr2W/lF0cSxQY6Qm5qaLLwZmvEYXrpxoedV+lD X-Received: by 2002:a17:902:d5ce:b0:158:48db:9719 with SMTP id g14-20020a170902d5ce00b0015848db9719mr16115plh.7.1651783501874; Thu, 05 May 2022 13:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651783501; cv=none; d=google.com; s=arc-20160816; b=nUn51WMYKGoSb9v8wVdPC5lu9s8LwrltcgoHW/OwVzbwxWL98ZuPdxj5OXQU85agMx XDchtwLglaaSPw2xdjRYgStSFp8qxw4MGkf96IkMJxWB8gx5fx5WLwYRdKeYH2cGbJYT hi3SDAS0vIeaFYYpj5JISELdfxJgmKsAna+SiaQRgRI2cpTnZOsDMDUPEr4z8IDmuo7u SL+d0uOYoS3m385KLLXJNUt49DKXurivyCznWqWaagIVXKl9faUtnJw1r8i/XIyoNvK/ dFUzCxTKVGqqNJbhR44nYk4zyo9p5c6LJyptIqnoyKkgWfbwkKS8Y+Zy9bheJboIehA1 nPnA== 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=3lSczf3v0n1hyKkaXX1M/VRrRzFEsjPFyBtg5hJZ3HA=; b=TiBgt4NDF4op9Z/BkzNK6Pi6vUrBJG8xDF/7L0HVUvFedgjB18pl7tX6VjQfnlmmOz p9Gpdt68aYyi/Tg+mpgNRrmkJLEYoLJjuHolbaIDYfxGYjY1Grxh/1JDT8ry9ZEbUKv0 U/wR1eTV5oaoXj/PpIiYcUHCqRLgtpN9Qo4MrXl9cvOyq/k8oIjHo8SAZ++uHmIJcVKg RBJUDfpwCLShvW9eog8tzyQTvFe9kYeh5mXqv0N7JIbi7YrUz5JchebQ/9RtSX9I/Zj+ XMtVSJjiZ4gQBKo2Y6dwvuDUkPTpNiP6XwfEYgRuN1T0Ms1Cd96/+LA13blMoCxYAYf6 P6+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KuA83JlA; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z29-20020a63191d000000b003c63fd7c0b1si186790pgl.807.2022.05.05.13.44.47; Thu, 05 May 2022 13:45:01 -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=KuA83JlA; 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 S1358951AbiEDRfb (ORCPT + 99 others); Wed, 4 May 2022 13:35:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357320AbiEDRKG (ORCPT ); Wed, 4 May 2022 13:10:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC3254A932; Wed, 4 May 2022 09:57:15 -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 73474618D7; Wed, 4 May 2022 16:57:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C600DC385A5; Wed, 4 May 2022 16:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683434; bh=fiEjsMwi+sx83CopIVwfDXjNiCaih6WW+Reo85LpXa0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KuA83JlATmvj+/jJjzJURhnjuffKtc02qLVBuKh9OJcQnTCh9oK8gdqnFD0HwfknM crRAOuQj+gLk4EVNLGCmg5cO5jE6C8kR2CFYjeQtg4cv3g+yEVY5eD11AF8mhxZJOG NBiItB2OVBuuBhZTkxl4NkTQ4/79n1TuCZqg4IME= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaoqian Lin , Vinod Koul , Sasha Levin Subject: [PATCH 5.17 085/225] phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe Date: Wed, 4 May 2022 18:45:23 +0200 Message-Id: <20220504153118.619333350@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 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,T_SCC_BODY_TEXT_LINE 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 From: Miaoqian Lin [ Upstream commit d644e0d79829b1b9a14beedbdb0dc1256fc3677d ] The pm_runtime_enable will increase power disable depth. If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). And use pm_runtime_dont_use_autosuspend() to undo pm_runtime_use_autosuspend() In the PM Runtime docs: Drivers in ->remove() callback should undo the runtime PM changes done in ->probe(). Usually this means calling pm_runtime_disable(), pm_runtime_dont_use_autosuspend() etc. We should do this in error handling. Fixes: f7f50b2a7b05 ("phy: mapphone-mdm6600: Add runtime PM support for n_gsm on USB suspend") Signed-off-by: Miaoqian Lin Link: https://lore.kernel.org/r/20220301024615.31899-1-linmq006@gmail.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/motorola/phy-mapphone-mdm6600.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/phy/motorola/phy-mapphone-mdm6600.c b/drivers/phy/motorola/phy-mapphone-mdm6600.c index 5172971f4c36..3cd4d51c247c 100644 --- a/drivers/phy/motorola/phy-mapphone-mdm6600.c +++ b/drivers/phy/motorola/phy-mapphone-mdm6600.c @@ -629,7 +629,8 @@ static int phy_mdm6600_probe(struct platform_device *pdev) cleanup: if (error < 0) phy_mdm6600_device_power_off(ddata); - + pm_runtime_disable(ddata->dev); + pm_runtime_dont_use_autosuspend(ddata->dev); return error; } -- 2.35.1