From patchwork Thu Aug 5 21:45:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madhusudhan X-Patchwork-Id: 176402 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 autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Thu, 05 Aug 2010 22:45:37 +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 1Oh8Fs-0004fX-TY for chris@printf.net; Thu, 05 Aug 2010 22:45:37 +0100 Received: by mail.laptop.org (Postfix) id 61C4323A5E; Thu, 5 Aug 2010 17:45:19 -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 53F8923A5D for ; Thu, 5 Aug 2010 17:45:19 -0400 (EDT) X-ASG-Debug-ID: 1281044735-0b74020f0001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id LUFeN1ySuz1ReThd for ; Thu, 05 Aug 2010 17:45:35 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757032Ab0HEVpe (ORCPT ); Thu, 5 Aug 2010 17:45:34 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:33851 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756979Ab0HEVpe (ORCPT ); Thu, 5 Aug 2010 17:45:34 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o75LjS7a001474 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 5 Aug 2010 16:45:29 -0500 Received: from DTX0085561 (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o75LjSL7016129; Thu, 5 Aug 2010 16:45:28 -0500 (CDT) From: "Madhusudhan" To: , "'Pierre Ossman'" X-ASG-Orig-Subj: MMC card removal in suspend state Subject: MMC card removal in suspend state Date: Thu, 5 Aug 2010 16:45:28 -0500 Message-ID: <621C9491683D48E5992B340E62198CD6@am.dhcp.ti.com> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 Thread-Index: Acs054T8QaVw/RGmQfmFyZJ2d9PHhw== x-mimeole: Produced By Microsoft MimeOLE V6.00.2900.5931 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: 1281044735 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= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37139 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index aa75ac1..2e77963 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -191,6 +191,9 @@ void mmc_cleanup_queue(struct mmc_queue *mq) q->queuedata = NULL; spin_unlock_irqrestore(q->queue_lock, flags); + /* Make sure the queue isn't suspended, as that will deadlock */ + mmc_queue_resume(mq); + /* Then terminate our worker thread */ kthread_stop(mq->thread);