From patchwork Sun Mar 4 22:49:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 10257885 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 07CBD60365 for ; Sun, 4 Mar 2018 22:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0D6C2882D for ; Sun, 4 Mar 2018 22:49:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0F0D28849; Sun, 4 Mar 2018 22:49:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 145A62882D for ; Sun, 4 Mar 2018 22:49:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932283AbeCDWtm (ORCPT ); Sun, 4 Mar 2018 17:49:42 -0500 Received: from sauhun.de ([88.99.104.3]:36472 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932118AbeCDWtl (ORCPT ); Sun, 4 Mar 2018 17:49:41 -0500 Received: from localhost (p5486C6FD.dip0.t-ipconnect.de [84.134.198.253]) by pokefinder.org (Postfix) with ESMTPSA id 6CE8D2C6EA5; Sun, 4 Mar 2018 23:49:39 +0100 (CET) From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Masahiro Yamada , Ulf Hansson , Wolfram Sang Subject: [PATCH] mmc: tmio: populate correct callback when using GPIO CD Date: Sun, 4 Mar 2018 23:49:33 +0100 Message-Id: <20180304224933.17498-1-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch "mmc: tmio: support IP-builtin card detection logic" had a typo and populated RO instead of CD. Fix it. Signed-off-by: Wolfram Sang --- Ulf: I didn't add a Fixes: tag because you used to sometimes rebase your for-next branch and thus the tag would dangle then. Do you still do that BTW? drivers/mmc/host/tmio_mmc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index d82dfea381727e..e30df9ad8197c4 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1244,7 +1244,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) _host->ops.get_ro = mmc_gpio_get_ro; if (mmc_can_gpio_cd(mmc)) - _host->ops.get_ro = mmc_gpio_get_cd; + _host->ops.get_cd = mmc_gpio_get_cd; _host->native_hotplug = !(mmc_can_gpio_cd(mmc) || mmc->caps & MMC_CAP_NEEDS_POLL ||