From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE7EFC35294 for ; Mon, 18 Apr 2022 14:26:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344613AbiDRO1y (ORCPT ); Mon, 18 Apr 2022 10:27:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344025AbiDROQm (ORCPT ); Mon, 18 Apr 2022 10:16:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CEC8396B7; Mon, 18 Apr 2022 06:13:04 -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 9246B60F16; Mon, 18 Apr 2022 13:12:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E5C9C385A1; Mon, 18 Apr 2022 13:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650287558; bh=6qmuWssJE8BGwTQm90LV/eDA7PH3hvnsKvgw2QngIXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pV5rk0noWlAfnxTm4pyHPl7XWD3UmNPlrP1Z8sKWceU6s3H72v7H7ba/sBtwA+ClT PsePp1BM5rHoUSxgGwax57rYGUW1PqFKbYQvoyP46k0471EBvzcrRY0J74ZTTJgxnQ JSsA0FtrN3uuw6NGHzLlpjDeiBE0Y+BqsesvB4P8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vinod Koul Subject: [PATCH 4.9 198/218] dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error" Date: Mon, 18 Apr 2022 14:14:24 +0200 Message-Id: <20220418121207.282275188@linuxfoundation.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220418121158.636999985@linuxfoundation.org> References: <20220418121158.636999985@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinod Koul commit d143f939a95696d38ff800ada14402fa50ebbd6c upstream. This reverts commit 455896c53d5b ("dmaengine: shdma: Fix runtime PM imbalance on error") as the patch wrongly reduced the count on error and did not bail out. So drop the count by reverting the patch . Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/dma/sh/shdma-base.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c @@ -118,10 +118,8 @@ static dma_cookie_t shdma_tx_submit(stru ret = pm_runtime_get(schan->dev); spin_unlock_irq(&schan->chan_lock); - if (ret < 0) { + if (ret < 0) dev_err(schan->dev, "%s(): GET = %d\n", __func__, ret); - pm_runtime_put(schan->dev); - } pm_runtime_barrier(schan->dev);