From patchwork Tue Mar 8 21:32:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 619571 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p28LW6Nk005763 for ; Tue, 8 Mar 2011 21:32:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754258Ab1CHVcF (ORCPT ); Tue, 8 Mar 2011 16:32:05 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:53272 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755949Ab1CHVcF (ORCPT ); Tue, 8 Mar 2011 16:32:05 -0500 Received: by wya21 with SMTP id 21so393148wya.19 for ; Tue, 08 Mar 2011 13:32:04 -0800 (PST) Received: by 10.227.91.81 with SMTP id l17mr5062985wbm.29.1299619923932; Tue, 08 Mar 2011 13:32:03 -0800 (PST) Received: from localhost.localdomain (93-172-156-109.bb.netvision.net.il [93.172.156.109]) by mx.google.com with ESMTPS id u9sm888795wbg.0.2011.03.08.13.32.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Mar 2011 13:32:03 -0800 (PST) From: Ohad Ben-Cohen To: Cc: Chris Ball , Dmitry Shmidt , Maxim Levitsky , Ohad Ben-Cohen , Subject: [PATCH] mmc: fix CONFIG_MMC_UNSAFE_RESUME regression Date: Tue, 8 Mar 2011 23:32:02 +0200 Message-Id: <1299619922-22220-1-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 08 Mar 2011 21:32:10 +0000 (UTC) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 6625c05..150b5f3 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1529,7 +1529,7 @@ void mmc_rescan(struct work_struct *work) * still present */ if (host->bus_ops && host->bus_ops->detect && !host->bus_dead - && mmc_card_is_removable(host)) + && !(host->caps & MMC_CAP_NONREMOVABLE)) host->bus_ops->detect(host); /*