Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8076258ybl; Thu, 16 Jan 2020 10:12:34 -0800 (PST) X-Google-Smtp-Source: APXvYqzGNDVU3ySeTR3s65ktjWL/9EvZed8FxzpXSHMyHcU7PmM4vJNcBN/NkifRGmmc6nGL3vaA X-Received: by 2002:a9d:774e:: with SMTP id t14mr2987161otl.358.1579198354731; Thu, 16 Jan 2020 10:12:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579198354; cv=none; d=google.com; s=arc-20160816; b=aZeDjE4K9y55rHJYseB3YRZz/utWSBHrzMbmUkqVyt6GkoREPr7SXN2Qg9iU3U9+up +/xolP3gCiytZpklC3dYC667N2GkELNPLvaHyGOwxG2/0QvQwIZUaDUwNAPJsJ6DRMF6 XBb3oK30VLlSQN8ClZIYGai8RRT2Snd1GSTfPYBG+imHeVfDLMA587NKlbePDjJj4Ha2 GwhroGmkNTMznFWzmt/DH2YcFzdQauz7TXucTePFZK6NMDqi8V2c/YgDaFvaWOtPBJ/R Z4zU/mEFp+hzpTXK3IrXCy/Rgo8XPRZjq9aphqc5nqtQTDotfFeLQIivfUmiTkzH27Rr X8JQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TNY9+Rk8KNkYN33g45XFOLvjt2X8YA4UI3F5lYzumGM=; b=joRH4G0KI5qmY/7Sz70MQNRV6YFcDlYSOEvhK35s4DRJRUpS8fwXTS1r5Ci3v7XukP MdNA/rBKy/gy5zgz5TcKM8mno1UFYo19lMtPeckxPoA6988octy5RI8rLAiikkVin/NF aTuWcmacV7FsHVjlI45vyHNq/XhZGIvrUsxnx6Q5Smb+Ez68Rk/chL6Bt3EORxa9iO9O 4KmHuYZ5LMyAZdbU0noOjwF3ZUYUMt0QyJiQbFo5gjqevkB76ds8O/XCGHP+TGF6Oug4 jdg9OqfQQs8FKmtCaJO4WArsmhF8eedaJz2EJQ1q3VJQEcz+hyfiouKd66J99w5k3ypR nObg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jyHndrtO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si11273730oif.83.2020.01.16.10.12.22; Thu, 16 Jan 2020 10:12:34 -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; dkim=pass header.i=@kernel.org header.s=default header.b=jyHndrtO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395305AbgAPSKw (ORCPT + 99 others); Thu, 16 Jan 2020 13:10:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:53178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393195AbgAPRhn (ORCPT ); Thu, 16 Jan 2020 12:37:43 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 116A2246D8; Thu, 16 Jan 2020 17:37:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196262; bh=TG5zhRS08XgjaFvPCbqcWFFnRDBrZMFyoPlDmRPuNak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jyHndrtOaGmWF4XI5RFtsLNV73Svb81iC57k6AZiKYRMO9Ab0qHjXnR8T0fW1oft+ kqxYyWDKhIkhGa3MZlIvvfWNn/gdvie4S+fefzzeeQdTbH4o68JV7HS9IlV3Xgd6Xj d7byMNn61jZgjflj5W7xDA5xZ/zkS+WH0uE+S0jg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stefan Wahren , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 087/251] mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe Date: Thu, 16 Jan 2020 12:33:56 -0500 Message-Id: <20200116173641.22137-47-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Wahren [ Upstream commit 1e20186e706da8446f9435f2924cd65ab1397e73 ] We need to handle mmc_of_parse() errors during probe otherwise the MMC driver could start without proper initialization (e.g. power sequence). Fixes: 476bf3d62d5c ("mmc: sdhci-brcmstb: Add driver for Broadcom BRCMSTB SoCs") Signed-off-by: Stefan Wahren Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-brcmstb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c index 159f6f64c68e..ed6473731b45 100644 --- a/drivers/mmc/host/sdhci-brcmstb.c +++ b/drivers/mmc/host/sdhci-brcmstb.c @@ -90,7 +90,9 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ; sdhci_get_of_property(pdev); - mmc_of_parse(host->mmc); + res = mmc_of_parse(host->mmc); + if (res) + goto err; /* * Supply the existing CAPS, but clear the UHS modes. This -- 2.20.1