Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp990423yba; Thu, 4 Apr 2019 01:54:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwBOfXEKWWGrCrn6N+9jKUtDosQk0AZqBHoOOZN5Bd9hdsv0L9sicK1LkSXtf8arxbteyew X-Received: by 2002:a63:7117:: with SMTP id m23mr4472422pgc.271.1554368065083; Thu, 04 Apr 2019 01:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554368065; cv=none; d=google.com; s=arc-20160816; b=jE2ZlQI7UP7+tCGavRuzZvFljSWZ3ASU2JKd4wasqerG0RMn6EhSkEFzaKhN5C0az5 LK8x30czVLm75+jM1nGBbtDLFIAx3DC1dhqdE3DM2bMwyLISbSGHJUTme6Lwork+KZlZ 3oahhvHABnMSjriZCW+DZwE2bF+z9NKg8K0nsPRHdIQnNgxKnjXCy8QQbK51cP337JA1 P4scq8Hek2oVrrF1igRGpqYpqp0eQsPusq74852Q532f7BRWZEQSObGbbrXq0LOWloN4 KzvRCKWyvU1z3dNWcf+tSq0udFkvuGbGcV4A2yJxR2a0fQIklNtNJCpFgFP27R1xUP82 /iOA== 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=X00sF9+tQnJh7o/+xA6587MdD5XZGr1XhIH77WKGVcU=; b=Uw3fFaBNifBNSSExfBM8CVNobNZB+KP29UPOmnyKWgNz6lyvQQFIGPSEDgWJFZ3Mmv 9Oj7qbEf8rLQXo3/C5LlRodoGvmHgbSXyAaGQA/eaF15TjnIsqmwhn4MHDH1sqhBTh4P Awu6AUVgzS/hx46ecR0f5kBtYuocW0xRx4p2g45kiZxQt5TS8RgD1RHB8zO57arS2y6I 5VU0AHk90zP+tlqLZIxaQPp/KuSBi+q61MdekACQzVrlQE96QRWBCYwYRqXshosqFyFZ kSyFEa2yBWH0wfY8ezpuasBZmsEUrwlQX/FCZkjUjAVbKKgbh9VuHbIGx4MhbOkgtfub I2cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y5OJ59gp; 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 g24si15945212pfd.212.2019.04.04.01.54.10; Thu, 04 Apr 2019 01:54:25 -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=Y5OJ59gp; 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 S1729703AbfDDIxD (ORCPT + 99 others); Thu, 4 Apr 2019 04:53:03 -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