Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1713c0d5 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Takashi Iwai
Browse files

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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ce71bfd1

sound/isa/opl3sa2.c

+2 −2
Original line number Diff line number Diff line
@@ -617,7 +617,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);

}
@@ -630,7 +630,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;