From patchwork Thu Aug 12 16:36:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 177002 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Thu, 12 Aug 2010 17:37:20 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OjamN-0003PL-VI for chris@printf.net; Thu, 12 Aug 2010 17:37:20 +0100 Received: by mail.laptop.org (Postfix) id E6CAC24B50; Thu, 12 Aug 2010 12:37:01 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id D0BB424B4E for ; Thu, 12 Aug 2010 12:37:01 -0400 (EDT) X-ASG-Debug-ID: 1281631038-0b747bed0001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id m6kekqnscfMyzrHu for ; Thu, 12 Aug 2010 12:37:18 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760269Ab0HLQhQ (ORCPT ); Thu, 12 Aug 2010 12:37:16 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:16494 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760080Ab0HLQhP (ORCPT ); Thu, 12 Aug 2010 12:37:15 -0400 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o7CGavNd020159 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 12 Aug 2010 16:36:58 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o7CAoGpG023373; Thu, 12 Aug 2010 16:36:56 GMT Received: from abhmt013.oracle.com by acsmt354.oracle.com with ESMTP id 511268551281631005; Thu, 12 Aug 2010 09:36:45 -0700 Received: from chimera.site (/173.50.240.230) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 12 Aug 2010 09:36:45 -0700 Date: Thu, 12 Aug 2010 09:36:43 -0700 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, linux-mmc@vger.kernel.org X-ASG-Orig-Subj: [PATCH] mmc: fix for CONFIG_PM disabled Subject: [PATCH] mmc: fix for CONFIG_PM disabled Message-Id: <20100812093643.852adc98.randy.dunlap@oracle.com> In-Reply-To: <201008112340.o7BNenDe021017@imap1.linux-foundation.org> References: <201008112340.o7BNenDe021017@imap1.linux-foundation.org> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1281631038 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests=UNPARSEABLE_RELAY X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37789 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 UNPARSEABLE_RELAY Informational: message has unparseable relay lines --- mmotm-2010-0811-1610.orig/drivers/mmc/core/host.c +++ mmotm-2010-0811-1610/drivers/mmc/core/host.c @@ -86,7 +86,9 @@ struct mmc_host *mmc_alloc_host(int extr init_waitqueue_head(&host->wq); INIT_DELAYED_WORK(&host->detect, mmc_rescan); INIT_DELAYED_WORK_DEFERRABLE(&host->disable, mmc_host_deeper_disable); +#ifdef CONFIG_PM host->pm_notify.notifier_call = mmc_pm_notify; +#endif /* * By default, hosts do not support SGIO or large requests.