Skip to content

Commit

Permalink
ALSA: us122l: add snd_us122l_free()
Browse files Browse the repository at this point in the history
Use it to clean up snd_us122l_card_used[].

Without patch unplugging of an US122L soundcard didn't reset the
corresponding element of snd_us122l_card_used[] to 0.
The (SNDRV_CARDS + 1)th plugging in did not result in creating the soundcard
device anymore.
Index values supplied with the modprobe command line were not used correctly
anymore after the first unplugging of an US122L.

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Cc: stable@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Karsten Wiese authored and Takashi Iwai committed Apr 20, 2009
1 parent f600f6c commit 5d4af1b
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions sound/usb/usx2y/us122l.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ static bool us122l_create_card(struct snd_card *card)
return true;
}

static void snd_us122l_free(struct snd_card *card)
{
struct us122l *us122l = US122L(card);
int index = us122l->chip.index;
if (index >= 0 && index < SNDRV_CARDS)
snd_us122l_card_used[index] = 0;
}

static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp)
{
int dev;
Expand All @@ -494,7 +502,7 @@ static int usx2y_create_card(struct usb_device *device, struct snd_card **cardp)
if (err < 0)
return err;
snd_us122l_card_used[US122L(card)->chip.index = dev] = 1;

card->private_free = snd_us122l_free;
US122L(card)->chip.dev = device;
US122L(card)->chip.card = card;
mutex_init(&US122L(card)->mutex);
Expand Down Expand Up @@ -588,7 +596,7 @@ static void snd_us122l_disconnect(struct usb_interface *intf)
}

usb_put_intf(intf);
usb_put_dev(US122L(card)->chip.dev);
usb_put_dev(us122l->chip.dev);

while (atomic_read(&us122l->mmap_count))
msleep(500);
Expand Down

0 comments on commit 5d4af1b

Please sign in to comment.