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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 26D78C4360F for ; Thu, 4 Apr 2019 08:53:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D94A92171F for ; Thu, 4 Apr 2019 08:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554367985; bh=NOFD3vZADtEvJQPUJqS8puKpT4mIKD522AVusmLC6Fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yBJ/Et5ihTk2vcavONpQgMQZLqyps6mWgVB2Ookyhsc3WJfSNcuk3C4BbpXM5d9zK LOi4wwTN4IgehBjkIGSPmJV7yt/R0D4zpIpzkaMMma49qRlSmMFxK1cJkBuJG0f5hs wctSWWYoavn+XqM8YZfwFCzUoGzRwuTWgPuveLVI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729731AbfDDIxE (ORCPT ); Thu, 4 Apr 2019 04:53:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:55196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728982AbfDDIxA (ORCPT ); Thu, 4 Apr 2019 04:53:00 -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 983C520882; Thu, 4 Apr 2019 08:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554367980; bh=NOFD3vZADtEvJQPUJqS8puKpT4mIKD522AVusmLC6Fg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y5OJ59gp0OY++5wE0CcPhW2dXUHxVMJVuyou/MiFLvZN53Wh0h8AK7Td48guQLWa4 dZoS96VsIH8ioFPXBpev8zB9tS6e9xowd+dX/X7UF84Ppt0EMNep6aVRd+Nglwy1/N atbbsogez5PHO9D/BEPNjPV3U4fYFiKJAjgn1i+M= 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 4.9 69/91] soc: qcom: gsbi: Fix error handling in gsbi_probe() Date: Thu, 4 Apr 2019 10:47:53 +0200 Message-Id: <20190404084539.446052915@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084535.450029272@linuxfoundation.org> References: <20190404084535.450029272@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 4.9-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