From patchwork Tue Sep 29 11:00:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 263162 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 E2AA2C47423 for ; Tue, 29 Sep 2020 11:58:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F4DA20756 for ; Tue, 29 Sep 2020 11:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601380717; bh=eoF0dWdcNrs2Y2ahm54PqBUOZIWXLcODEYHV/h1kc8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=09Syg1q368oOUWw81CxqDquklwOj+akCDSjhVZUjw1RVD+K5RqEFj77bUdmSMYOoN w2A9VAXu3yS0MI39KQf8gm6tJQt1N5Jcuue0g1PqdG/o6uBFjvZp1jv/F3zz5cWptl WK4/oY6qaQ2VCkgB9JlBo3d4pcLj5+1HvtVKnJAM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730328AbgI2L6X (ORCPT ); Tue, 29 Sep 2020 07:58:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:39312 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730399AbgI2LmI (ORCPT ); Tue, 29 Sep 2020 07:42:08 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D862206DB; Tue, 29 Sep 2020 11:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379727; bh=eoF0dWdcNrs2Y2ahm54PqBUOZIWXLcODEYHV/h1kc8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v6NDVApcfAJ5iTRF7PgWM5/K8TfiyyzZlcu1bUveCuw0S/ODJtWVIAGG/zL0/EILn ctM149yio7EiJQAgemwHLOOP4RZw+LTvwAPLpoLowkliwjqAwSm6JplRTtRAp77l27 wyZlCY6CJeYwDQ51MLbTOexmnQUsnuzl6kbWmBWc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Tony Lindgren , Kalle Valo , Sasha Levin Subject: [PATCH 5.4 292/388] wlcore: fix runtime pm imbalance in wlcore_regdomain_config Date: Tue, 29 Sep 2020 13:00:23 +0200 Message-Id: <20200929110024.601692081@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dinghao Liu [ Upstream commit 282a04bf1d8029eb98585cb5db3fd70fe8bc91f7 ] pm_runtime_get_sync() increments the runtime PM usage counter even the call returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced. Signed-off-by: Dinghao Liu Acked-by: Tony Lindgren Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20200520124649.10848-1-dinghao.liu@zju.edu.cn Signed-off-by: Sasha Levin --- drivers/net/wireless/ti/wlcore/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 547ad538d8b66..5f74cf821068d 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -3658,8 +3658,10 @@ void wlcore_regdomain_config(struct wl1271 *wl) goto out; ret = pm_runtime_get_sync(wl->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_autosuspend(wl->dev); goto out; + } ret = wlcore_cmd_regdomain_config_locked(wl); if (ret < 0) {