The patch titled
ALSA: avoid registering the same device twice
has been removed from the -mm tree. Its filename was
fix-gregkh-driver-sound-device-2.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ALSA: avoid registering the same device twice
From: Takashi Iwai <tiwai@xxxxxxx>
Fix to avoid the multiple call of device_create() in snd_card_register().
snd_card_register() may be called multiple times in design.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/core/init.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff -puN sound/core/init.c~fix-gregkh-driver-sound-device-2 sound/core/init.c
--- a/sound/core/init.c~fix-gregkh-driver-sound-device-2
+++ a/sound/core/init.c
@@ -497,10 +497,12 @@ int snd_card_register(struct snd_card *c
int err;
snd_assert(card != NULL, return -EINVAL);
- card->dev = device_create(sound_class, card->parent, 0, "card%i",
- card->number);
- if (IS_ERR(card->dev))
- card->dev = NULL;
+ if (!card->dev) {
+ card->dev = device_create(sound_class, card->parent, 0,
+ "card%i", card->number);
+ if (IS_ERR(card->dev))
+ card->dev = NULL;
+ }
if ((err = snd_device_register_all(card)) < 0)
return err;
mutex_lock(&snd_card_mutex);
_
Patches currently in -mm which might be from tiwai@xxxxxxx are
git-alsa.patch
mm-incorrect-vm_fault_oom-returns-from-drivers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
