From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753987AbYINIfS (ORCPT ); Sun, 14 Sep 2008 04:35:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751547AbYINIfG (ORCPT ); Sun, 14 Sep 2008 04:35:06 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:45785 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbYINIfF (ORCPT ); Sun, 14 Sep 2008 04:35:05 -0400 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Sun, 14 Sep 2008 10:35:05 +0200 (CEST) From: Stefan Richter Subject: [PATCH] firewire: time out in fw_core_remove_card To: linux1394-devel@lists.sourceforge.net cc: linux-kernel@vger.kernel.org Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-Disposition: INLINE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows "modprobe -r firewire-ohci" (or card unbinding in general) to proceed after 40 seconds even if there is a reference counting bug or other shutdown bug in upper layers. Signed-off-by: Stefan Richter --- drivers/firewire/fw-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: linux/drivers/firewire/fw-card.c =================================================================== --- linux.orig/drivers/firewire/fw-card.c +++ linux/drivers/firewire/fw-card.c @@ -16,6 +16,7 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -508,7 +509,8 @@ fw_core_remove_card(struct fw_card *card /* Wait for all users, especially device workqueue jobs, to finish. */ fw_card_put(card); - wait_for_completion(&card->done); + WARN(wait_for_completion_timeout(&card->done, 40 * HZ) == 0, + KBUILD_MODNAME ": forced card shutdown with references held\n"); cancel_delayed_work_sync(&card->work); WARN_ON(!list_empty(&card->transaction_list)); -- Stefan Richter -=====-==--- =--= -===- http://arcgraph.de/sr/