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 1D1BAC432C0 for ; Fri, 22 Nov 2019 11:24:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E664D20674 for ; Fri, 22 Nov 2019 11:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421864; bh=704GgVtjPbYQSRgT22k+tk3j6Fu7SlUM8LHDVu+aC9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v4xewsRkpFFFprmK3D1aiHDxwAMmNEC1XLLUyS4TOdJ7noRjFGS0OlPUqbm0XHFBd MmzKChk56SMngVfAe4mKyQiJhmFHi1pP9V7MZQeC0OuM/cbhXsKqAY5XcHv+bK/L4q gSxe7G0rO/rJPs2KaYs7qzA1rnhLBoRx+d2jzhPI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727980AbfKVKjP (ORCPT ); Fri, 22 Nov 2019 05:39:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:42130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727289AbfKVKjK (ORCPT ); Fri, 22 Nov 2019 05:39:10 -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 D01932071C; Fri, 22 Nov 2019 10:39:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419150; bh=704GgVtjPbYQSRgT22k+tk3j6Fu7SlUM8LHDVu+aC9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xnsr8BCncteZERF7OBYW6jzrQQmelRIGxxPqv7hjFK5ta4QXUJssPiBDCjXCBap/j 2rCQQVaK9CUV46lOCkRHQPng9phOeo9VwqRVwbmz4kv9aQB/TMBLglGOTR6aMHgU4o uQdUOk84Kc3rnEX9wnJTvdONjRohs0ETI2Rsdl1I= 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.9 015/222] mmc: sdhci-of-at91: fix quirk2 overwrite Date: Fri, 22 Nov 2019 11:25:55 +0100 Message-Id: <20191122100834.762535278@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@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 @@ -318,7 +318,7 @@ static int sdhci_at91_probe(struct platf pm_runtime_use_autosuspend(&pdev->dev); /* 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)