From patchwork Mon Aug 12 07:02:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasanna NAVARATNA X-Patchwork-Id: 2842872 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 38CE39F239 for ; Mon, 12 Aug 2013 07:02:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20A5E20266 for ; Mon, 12 Aug 2013 07:02:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F06F62025B for ; Mon, 12 Aug 2013 07:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751243Ab3HLHC0 (ORCPT ); Mon, 12 Aug 2013 03:02:26 -0400 Received: from plane.gmane.org ([80.91.229.3]:48575 "EHLO plane.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751187Ab3HLHCZ (ORCPT ); Mon, 12 Aug 2013 03:02:25 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1V8m91-0007fs-OJ for linux-mmc@vger.kernel.org; Mon, 12 Aug 2013 09:02:24 +0200 Received: from 202.122.18.226 ([202.122.18.226]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 12 Aug 2013 09:02:23 +0200 Received: from prasanna.navaratna by 202.122.18.226 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 12 Aug 2013 09:02:23 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: linux-mmc@vger.kernel.org From: Prasanna NAVARATNA Subject: mmc: core: Add check for card type before =?utf-8?b?bW1jX2h3X3Jlc2V0X2Zvcl9pbml0?= Date: Mon, 12 Aug 2013 07:02:02 +0000 (UTC) Lines: 39 Message-ID: Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: sea.gmane.org User-Agent: Loom/3.14 (http://gmane.org/) X-Loom-IP: 202.122.18.226 (Mozilla/5.0 (Windows NT 6.1; rv:21.0) Gecko/20100101 Firefox/21.0) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, FSL_HELO_BARE_IP_2, RCVD_IN_DNSWL_HI, RCVD_NUMERIC_HELO, RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Almost all the places, before calling hw_reset ops, the card type is checked to make sure it is eMMC but missed during mmc_rescan_try_freq. The below patch adds the check for card type before calling hardware reset for init as double safety measure. From e7941c5b3b4999318feb59fa83b78c15c13493b3 Mon Sep 17 00:00:00 2001 From: Prasanna NAVARATNA Date: Mon, 12 Aug 2013 12:26:57 +0530 Subject: [PATCH] mmc: core: add check for card type before mmc_hw_reset_for_init During mmc_hw_reset_for_init, the card type is not checked before calling hw_reset ops. Add check for the card type as emmc before issuing hw_reset during init. Signed-off-by: Prasanna NAVARATNA --- drivers/mmc/core/core.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 49a5bca..2dad69a 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2196,7 +2196,8 @@ EXPORT_SYMBOL(mmc_set_blockcount); static void mmc_hw_reset_for_init(struct mmc_host *host) { - if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset) + if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset || + !mmc_card_mmc(host->card)) return; mmc_host_clk_hold(host); host->ops->hw_reset(host);