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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 78841C432C3 for ; Fri, 22 Nov 2019 11:28:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 469F920679 for ; Fri, 22 Nov 2019 11:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574422099; bh=Ihs03V0acXFwzpCbFFOo0fWqOQ4u9LrOg/yDjzFWxTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hLh/FCJdxDzBHyro5I+GZT6boEcY1/6hYbz0oZPlbBW/K2Q6oFTVbV3sJ2Z7bZxlz GapbGuOwiFu68+McK7p52LmZtPmwzFA6YWJqtj91ps04zjqscDRelpp2wJYSKYOryn NmoClSfssMUI3PcfmJ9+94K87j91EeJyl0FW1P84= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727090AbfKVKbG (ORCPT ); Fri, 22 Nov 2019 05:31:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:50896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726417AbfKVKbG (ORCPT ); Fri, 22 Nov 2019 05:31:06 -0500 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 160A520708; Fri, 22 Nov 2019 10:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418665; bh=Ihs03V0acXFwzpCbFFOo0fWqOQ4u9LrOg/yDjzFWxTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UHRD7uUX0YVBFfEzPf4VbjHPuyTL1bicQPVa3i11oTnXtonGnDvNlBCfx7+Brlbg/ NUu0VjpDQnoAAW/UnkZ9CvaVH0qEgYE49lm97ZnrcNcnd4cMtqWZG1zykCBAjvELGX Kzsoty/iwWuQXC08WHTFIIcoCI9upO5LfNv5LLzc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eugen Hristev , Adrian Hunter , Ulf Hansson Subject: [PATCH 4.4 011/159] mmc: sdhci-of-at91: fix quirk2 overwrite Date: Fri, 22 Nov 2019 11:26:42 +0100 Message-Id: <20191122100717.490100948@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev commit fed23c5829ecab4ddc712d7b0046e59610ca3ba4 upstream. The quirks2 are parsed and set (e.g. from DT) before the quirk for broken HS200 is set in the driver. The driver needs to enable just this flag, not rewrite the whole quirk set. Fixes: 7871aa60ae00 ("mmc: sdhci-of-at91: add quirk for broken HS200") Signed-off-by: Eugen Hristev Acked-by: Adrian Hunter Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-of-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mmc/host/sdhci-of-at91.c +++ b/drivers/mmc/host/sdhci-of-at91.c @@ -145,7 +145,7 @@ static int sdhci_at91_probe(struct platf sdhci_get_of_property(pdev); /* HS200 is broken at this moment */ - host->quirks2 = SDHCI_QUIRK2_BROKEN_HS200; + host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200; ret = sdhci_add_host(host); if (ret)