X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sound%2Fisa%2Fopl3sa2.c;h=ef95279da7a3a47a7bcfe5b21674e6c0f063ce7d;hb=b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9;hp=9c5fce31f06bdb2e61d9b8ce8fcdacba0bbe6f26;hpb=c9294e4b3793e2bd397691ae015283eecca29562;p=~andy%2Flinux

diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 9c5fce31f06..ef95279da7a 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;