openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: opl3sa2 fix irq releasing and short name of card 

Two simple fixes:

1. Use the same pointer for the free_irq() and
   the request_irq() calls.

2. A short name of card is appended with '2' or '3'
   character depending on a detected chip. Remove
   the '2' character from the short name.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Krzysztof Helt 2009-02-27 21:41:40 +01:00 committed by Takashi Iwai
parent ce71bfd1aa
commit 1713c0d508
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/isa/opl3sa2.c
View File

@ -617,7 +617,7 @@ static void snd_opl3sa2_free(struct snd_card *card)
{ {
struct snd_opl3sa2 *chip = card->private_data; struct snd_opl3sa2 *chip = card->private_data;
if (chip->irq >= 0) if (chip->irq >= 0)
free_irq(chip->irq, (void *)chip); free_irq(chip->irq, card);
release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_port);
} }
@ -630,7 +630,7 @@ static struct snd_card *snd_opl3sa2_card_new(int dev)
if (card == NULL) if (card == NULL)
return NULL; return NULL;
strcpy(card->driver, "OPL3SA2"); strcpy(card->driver, "OPL3SA2");
strcpy(card->shortname, "Yamaha OPL3-SA2"); strcpy(card->shortname, "Yamaha OPL3-SA");
chip = card->private_data; chip = card->private_data;
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);
chip->irq = -1; chip->irq = -1;