diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
| commit | fa15fdeffa3977b17882f485547e65296cf0bd30 (patch) | |
| tree | 79ef506dd09de46687598ee340e4d6f85494aa19 /sound/isa/opl3sa2.c | |
| parent | 843ad02fa4fb9230cd19923cc8ea1d6096cadf4e (diff) | |
| parent | 37ba1b62836d2440980cf553c49556393b05c6cd (diff) | |
| download | op-kernel-dev-fa15fdeffa3977b17882f485547e65296cf0bd30.zip op-kernel-dev-fa15fdeffa3977b17882f485547e65296cf0bd30.tar.gz | |
Merge branch 'topic/isa-misc' into for-linus
Diffstat (limited to 'sound/isa/opl3sa2.c')
| -rw-r--r-- | sound/isa/opl3sa2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 9c5fce3..ef95279d 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c @@ -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; |
