Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753313AbdCBNxA (ORCPT ); Thu, 2 Mar 2017 08:53:00 -0500 Received: from keymaster.Cadence.COM ([158.140.2.26]:36312 "EHLO mx-sanjose5.cadence.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114AbdCBNsg (ORCPT ); Thu, 2 Mar 2017 08:48:36 -0500 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com From: Piotr Sroka To: CC: Ulf Hansson , Chaotian Jing , Shawn Lin , Gwendal Grignou , Dong Aisheng , , Piotr Sroka Subject: [PATCH] mmc: core: fix changing bus witdh in hs400es mode Date: Thu, 2 Mar 2017 13:47:34 +0000 Message-ID: <1488462454-905-1-git-send-email-piotrs@cadence.com> X-Mailer: git-send-email 2.2.2 MIME-Version: 1.0 Content-Type: text/plain X-OrganizationHeadersPreserved: maileu3.global.cadence.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 679 Lines: 22 Fix the code to avoid changing bus width if HS400ES mode is selected. Signed-off-by: Piotr Sroka --- drivers/mmc/core/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 7fd7228..c7d9c9f 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1730,7 +1730,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, err = mmc_select_hs400(card); if (err) goto free_card; - } else { + } else if (!mmc_card_hs400(card)) { /* Select the desired bus width optionally */ err = mmc_select_bus_width(card); if (err > 0 && mmc_card_hs(card)) { -- 2.2.2