From patchwork Wed Dec 8 15:23:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 390922 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 oB8FOWVx008158 for ; Wed, 8 Dec 2010 15:24:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755872Ab0LHPYB (ORCPT ); Wed, 8 Dec 2010 10:24:01 -0500 Received: from cantor2.suse.de ([195.135.220.15]:47594 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755680Ab0LHPYA (ORCPT ); Wed, 8 Dec 2010 10:24:00 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id F40608738D; Wed, 8 Dec 2010 16:23:59 +0100 (CET) From: Takashi Iwai To: Chris Ball Cc: Maxim Levitsky , Oliver Neukum , Andrew Morton , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mmc: Fix re-probing after hibernation Date: Wed, 8 Dec 2010 16:23:59 +0100 Message-Id: <1291821839-15088-1-git-send-email-tiwai@suse.de> X-Mailer: git-send-email 1.7.3.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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 08 Dec 2010 15:24:32 +0000 (UTC) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 31ae07a..30094f6 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1772,7 +1772,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, break; case PM_POST_SUSPEND: - case PM_POST_HIBERNATION: + case PM_POST_RESTORE: spin_lock_irqsave(&host->lock, flags); host->rescan_disable = 0;