Received: by 10.223.185.116 with SMTP id b49csp1063410wrg; Fri, 23 Feb 2018 11:14:47 -0800 (PST) X-Google-Smtp-Source: AH8x2275acLjAr1Wpet4TA2rGTq211OszRKOoNEXSpMQW5kBchLkdfJrzurPdYVwui0fAydxme+w X-Received: by 10.99.186.73 with SMTP id l9mr2153889pgu.83.1519413287660; Fri, 23 Feb 2018 11:14:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413287; cv=none; d=google.com; s=arc-20160816; b=z+ZB+k3hHGj8mhGJpnJGMbXiLzrWDU1e4ZkFaRNIEhYtJXy8yu8g48EhZQKfaiVsAU BsJiIwv3ej39Ejy8F0Xw+cFikeHeMQHFM3gc6sjN2aNSb9bZhob8QBwHeXbKHVKynLaZ wN5SCUoQaL0MdA7avvI1g8sNj2gaRO51f0K0IqqsbAaP9PtczKGC8w339OBsaP8Fd1VJ ZFg+sfyf6gkDANgQkd6V7zdTc5bQWiY7KuTsJV8J2BvSo5MnMiPNDI2SLObRAI7tqXH/ sFD6I+FBdFjAkB1ZEAmS7tfuz3U7HJZT3sDrPsB7Y+IVBXZz9vch4d4CYyb+JO4+0M5M wdxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=UJm8ZBKPjf/w78ihBGFpijG6GVGFA69zdIz75qpsV8o=; b=UFe5Q4V7zI8nHu6hZIMoma+7Om9+f2tw0yy1dSkeeUgTColxcBVSOgvkqKn2VrSAtZ c7FiG2BiP1A2VgAIRQk+e5T0uBujfDwFiHLGvB2F6C4GM1l3XKIUl84UWmcWRjvcAlOo nQzSno6c3ZkyH8cHpcJ1ZJvpbhuZqUETKJO51K3E9PwafJijIvyxSZ08AOxv0mAUorJ+ H4Blbza8GutaIXRBiwlZ3aShtmodccdj8lQnU1R5JwMIoM9rPIUFBW6yJPres9F6NXok oCRX1IYDc6HjE65I9xUIiGzSR7HTQJ25j/AMwhNyLBsYVTlXR4jyIoj0pwvuRxQINZjI 7Qaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l85si1093548pfg.104.2018.02.23.11.14.32; Fri, 23 Feb 2018 11:14:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935594AbeBWTNv (ORCPT + 99 others); Fri, 23 Feb 2018 14:13:51 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:48464 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964958AbeBWSz5 (ORCPT ); Fri, 23 Feb 2018 13:55:57 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 0B8421278; Fri, 23 Feb 2018 18:55:56 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tobias Jordan , Vinod Koul , Sasha Levin Subject: [PATCH 4.14 144/159] dmaengine: jz4740: disable/unprepare clk if probe fails Date: Fri, 23 Feb 2018 19:27:32 +0100 Message-Id: <20180223170800.414098339@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tobias Jordan [ Upstream commit eb9436966fdc84cebdf222952a99898ab46d9bb0 ] in error path of jz4740_dma_probe(), call clk_disable_unprepare() to clean up. Found by Linux Driver Verification project (linuxtesting.org). Fixes: 25ce6c35fea0 MIPS: jz4740: Remove custom DMA API Signed-off-by: Tobias Jordan Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/dma/dma-jz4740.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/dma/dma-jz4740.c +++ b/drivers/dma/dma-jz4740.c @@ -555,7 +555,7 @@ static int jz4740_dma_probe(struct platf ret = dma_async_device_register(dd); if (ret) - return ret; + goto err_clk; irq = platform_get_irq(pdev, 0); ret = request_irq(irq, jz4740_dma_irq, 0, dev_name(&pdev->dev), dmadev); @@ -568,6 +568,8 @@ static int jz4740_dma_probe(struct platf err_unregister: dma_async_device_unregister(dd); +err_clk: + clk_disable_unprepare(dmadev->clk); return ret; }