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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 0C422C282C4 for ; Mon, 4 Feb 2019 11:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFA062075C for ; Mon, 4 Feb 2019 11:06:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549278398; bh=jq2RqgrpqFU+pN17kVcFkwrMlv2TG6+B7rNh1P+ye6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=prPGwzJ57xL4pGx/ANVABzyiDIhauaVP87CI3IGQc/BsBBOhA3wgfNpbziBLhGwkZ T/SOacQ2CiugKYFof2tvgf4Rg47GsuePGEa8gQaqKFlzG50D3/bbGy0vegzZD4YzjP A/iZFe6vevpK2JFjpVKUEb3IUMBJRp4CwVZMf924= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730765AbfBDKnf (ORCPT ); Mon, 4 Feb 2019 05:43:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:41330 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730204AbfBDKna (ORCPT ); Mon, 4 Feb 2019 05:43:30 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 A83932070C; Mon, 4 Feb 2019 10:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277010; bh=jq2RqgrpqFU+pN17kVcFkwrMlv2TG6+B7rNh1P+ye6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBiS+R9am3TdBHx8CLCGZ4uY4V5Gt7hns1pxDQomb8RPpBWmZTnbN/z3VbzoVs76K +Q3YcbahKwrd0QiyGAV3cGdvmMyxquw5B99EaO1lm/DxpKSOm0Ky2H69rboQy5s3l4 WEZOGATJ/L+XdiCP9X6UHyc6QwQn8zW1i+a36zOA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Wahren , Adrian Hunter , Ulf Hansson Subject: [PATCH 4.9 22/30] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe Date: Mon, 4 Feb 2019 11:37:00 +0100 Message-Id: <20190204103609.389016883@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103605.271746870@linuxfoundation.org> References: <20190204103605.271746870@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. ------------------ From: Stefan Wahren commit 2bd44dadd5bfb4135162322fd0b45a174d4ad5bf upstream. We need to handle mmc_of_parse() errors during probe. This finally fixes the wifi regression on Raspberry Pi 3 series. In error case the wifi chip was permanently in reset because of the power sequence depending on the deferred probe of the GPIO expander. Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") Cc: stable@vger.kernel.org Signed-off-by: Stefan Wahren Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-iproc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -242,7 +242,10 @@ static int sdhci_iproc_probe(struct plat iproc_host->data = iproc_data; - mmc_of_parse(host->mmc); + ret = mmc_of_parse(host->mmc); + if (ret) + goto err; + sdhci_get_of_property(pdev); host->mmc->caps |= iproc_host->data->mmc_caps;