[alsa-devel] [PATCH] opl3sa2 fix irq releasing and short name of card

[Krzysztof Helt]

From: Krzysztof Helt <krzysztof.h1 at wp.pl>

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 at wp.pl>
---

The short name without the patch is "OPL3-SA23"
for opl3-sa3.

 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 58c972b..9a53ab4 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -613,7 +613,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);
 }
 
@@ -626,7 +626,7 @@ static struct snd_card *snd_opl3sa2_card_new(int dev)
 	if (card == NULL)
 		return NULL;
 	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;
-- 
1.5.2.2



----------------------------------------------------------------------
169 stacji TV! Naziemne i satelitarne!
Sprawdz program TV w kilka sekund >> http://link.interia.pl/f2050