From: Mark Brown Date: Wed, 3 Jun 2009 19:43:29 +0000 (+0100) Subject: ALSA: Fix double locking of card list in snd_card_register() X-Git-Tag: v2.6.31-rc1~363^2~24^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=872c78202c58d26596e25743791ee81a7d24abad;p=pandora-kernel.git ALSA: Fix double locking of card list in snd_card_register() The introduction of snd_card_set_id() added a lock on the card list to the old choose_default_id() function when using it to implement the new API call. This lock is needed to allow us to walk the list and check to see if our new name is a duplicate. Unfortunately this causes a lockup when called from snd_card_register() (in cases where no ID is supplied for the card) since the card list is already locked there. Fix this fairly hideously by factoring out the implementation and using a flag to indicate if the lock should be held. A better fix would probably be to refactor snd_card_register() to move the _set_id() outside the locking region but I can't immediately see anything I can convince myself is safe. Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai --- Reading git-diff-tree failed