Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1007107yba; Thu, 4 Apr 2019 02:16:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqygU7Nn2EWYxgSymH4lDg4PIq0SWWIzJSb5m9rZwuuSVTtReacE1S14ikKw0pEKRh7Q44jw X-Received: by 2002:a17:902:2f43:: with SMTP id s61mr5247918plb.158.1554369380002; Thu, 04 Apr 2019 02:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554369379; cv=none; d=google.com; s=arc-20160816; b=lC7Vu1/InVOGJimvfAhQcxxfzsQYtEwv8ZAJ2vKI8HPXltpK1xAEZq5Bi9dXOYoFKQ iWQcfe8wDQTjhozXNfePt9vlwk0l9Gb6CE2I0OdfgPU0I32E3I2hp2H9a7w7ldF/f7mx AgyG2aNdyVB1ve8rlIR5wl0/C5y6NjkxxclAjjnz1IIeOmJ/gOQySIsiqxWSdwlTSMK7 QvCPZaCjXe47h2vyiFPYOUVGlkVfEfcqNLspWKDx2H6r81mg+bGHVjVntTQFVNsm7Gla SH/ylW9gjQRRRX3X4qqQx0bROF8ctU/BffH7OfoLtwH4mXF9l9Zu5Tw115k0p2ZY/qho PV8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C+Wtz2dSS/C8GLSRgQJOTuLPOMrhCVzyI9roPvrZpVM=; b=W6bJAsF+Itj/oXp0TwnYe0HxhIpY9NlKr+GnfK0w1ENkwptDwzdvYzW4DobMpIuWsn /91snrXYn0unypxRVKNJlikwWnJm7VB5g4Ls54mZ0zoZKI0sj+KVogWh2lS6b4JKwuRL YXm7DhC/8ck4H9gQPl7EvJQzRx8FenrVFI0sYejLk+8HoK+yU9byHMSy69W8pzxIxzjr zYNTdw0u8+0zDdsiN3B2NvobYVrXfhA7qHNxyvtTWgMgnoiE5jHIwb4xCMai2iIX3cd0 qF6/AyyFz7lBnXIaYMeFY0ZEq6y/Aplj7jKsv5pmen9IIqiiAhOQ3tZWVcxAz7K+MuYp CUsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ggzM+GlT; 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 66si16211044plc.88.2019.04.04.02.16.04; Thu, 04 Apr 2019 02:16:19 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=ggzM+GlT; 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 S2387899AbfDDJP3 (ORCPT + 99 others); Thu, 4 Apr 2019 05:15:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:56452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387663AbfDDJP1 (ORCPT ); Thu, 4 Apr 2019 05:15:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 1E34A2184B; Thu, 4 Apr 2019 09:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554369326; bh=vJKVFPivyvnBqRazTrfufH0tIHKvzYAF8q2S/2hlv0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ggzM+GlTd5fJFj9CWc6xE5zaZvBlGdErRcthk15jWEjtoxvQGf6KnqRJ13XNKJgYT zBNnI+syQED82Mr3fhAttTLcuT6+Rz+O2azn8kjwh3nDgxtXEB/4zOhUO2p6nj8RXI ouF2vJ+1Y4Ncvj9msSjwXybpBahhYVRp5nBHx2jM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexey Khoroshilov , Bjorn Andersson , Andy Gross , Sasha Levin Subject: [PATCH 5.0 181/246] soc: qcom: gsbi: Fix error handling in gsbi_probe() Date: Thu, 4 Apr 2019 10:48:01 +0200 Message-Id: <20190404084625.519134249@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084619.236418459@linuxfoundation.org> References: <20190404084619.236418459@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 8cd09a3dd3e176c62da67efcd477a44a8d87185e ] If of_platform_populate() fails in gsbi_probe(), gsbi->hclk is left undisabled. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: Bjorn Andersson Signed-off-by: Andy Gross Signed-off-by: Sasha Levin --- drivers/soc/qcom/qcom_gsbi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c index 09c669e70d63..038abc377fdb 100644 --- a/drivers/soc/qcom/qcom_gsbi.c +++ b/drivers/soc/qcom/qcom_gsbi.c @@ -138,7 +138,7 @@ static int gsbi_probe(struct platform_device *pdev) struct resource *res; void __iomem *base; struct gsbi_info *gsbi; - int i; + int i, ret; u32 mask, gsbi_num; const struct crci_config *config = NULL; @@ -221,7 +221,10 @@ static int gsbi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, gsbi); - return of_platform_populate(node, NULL, NULL, &pdev->dev); + ret = of_platform_populate(node, NULL, NULL, &pdev->dev); + if (ret) + clk_disable_unprepare(gsbi->hclk); + return ret; } static int gsbi_remove(struct platform_device *pdev) -- 2.19.1