From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753445AbZBAKWT (ORCPT ); Sun, 1 Feb 2009 05:22:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752618AbZBAKWL (ORCPT ); Sun, 1 Feb 2009 05:22:11 -0500 Received: from einhorn.in-berlin.de ([192.109.42.8]:49115 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569AbZBAKWK (ORCPT ); Sun, 1 Feb 2009 05:22:10 -0500 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Sun, 1 Feb 2009 11:21:55 +0100 (CET) From: Stefan Richter Subject: Re: [Bug 12592] New: fw_card_add adds card to the list even on enable failure To: linux1394-devel@lists.sourceforge.net cc: linux-kernel@vger.kernel.org, Petr Vandrovec In-Reply-To: <49857750.2010109@s5r6.in-berlin.de> Message-ID: References: <49857750.2010109@s5r6.in-berlin.de> 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 Date: Sun, 1 Feb 2009 01:29:35 -0800 (PST) From: Petr Vandrovec Subject: firewire: core: Remove card from list of cards when enable fails Signed-off-by: Petr Vandrovec After a controller initialization failure, addition of another card got stuck due to card_list corruption. Signed-off-by: Stefan Richter --- drivers/firewire/fw-card.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Index: linux/drivers/firewire/fw-card.c =================================================================== --- linux.orig/drivers/firewire/fw-card.c +++ linux/drivers/firewire/fw-card.c @@ -412,6 +412,7 @@ fw_card_add(struct fw_card *card, { u32 *config_rom; size_t length; + int err; card->max_receive = max_receive; card->link_speed = link_speed; @@ -422,7 +423,13 @@ fw_card_add(struct fw_card *card, list_add_tail(&card->link, &card_list); mutex_unlock(&card_mutex); - return card->driver->enable(card, config_rom, length); + err = card->driver->enable(card, config_rom, length); + if (err < 0) { + mutex_lock(&card_mutex); + list_del(&card->link); + mutex_unlock(&card_mutex); + } + return err; } EXPORT_SYMBOL(fw_card_add); -- Stefan Richter -=====-==--= --=- ----= http://arcgraph.de/sr/