lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/isa-misc' into for-linus

Browse Source
This commit is contained in:
Takashi Iwai
2009-03-24 00:36:13 +01:00
parent 843ad02fa4 37ba1b6283
commit fa15fdeffa
3 changed files with 123 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/isa/opl3sa2.c
View File

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