aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-07-23 05:35:55 -0400
committerTakashi Iwai <tiwai@suse.de>2012-07-25 08:04:04 -0400
commitbc733d495267a23ef8660220d696c6e549ce30b3 (patch)
tree008c758e246a885cf0f163cb61820028ac0e9a1a /sound
parent6162552b0de6ba80937c3dd53e084967851cd199 (diff)
ALSA: mpu401: Fix missing initialization of irq field
The irq field of struct snd_mpu401 is supposed to be initialized to -1. Since it's set to zero as of now, a probing error before the irq installation results in a kernel warning "Trying to free already-free IRQ 0". Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=44821 Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/drivers/mpu401/mpu401_uart.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 1cff331a228e..4608c2ca43f8 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -554,6 +554,7 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,
554 spin_lock_init(&mpu->output_lock); 554 spin_lock_init(&mpu->output_lock);
555 spin_lock_init(&mpu->timer_lock); 555 spin_lock_init(&mpu->timer_lock);
556 mpu->hardware = hardware; 556 mpu->hardware = hardware;
557 mpu->irq = -1;
557 if (! (info_flags & MPU401_INFO_INTEGRATED)) { 558 if (! (info_flags & MPU401_INFO_INTEGRATED)) {
558 int res_size = hardware == MPU401_HW_PC98II ? 4 : 2; 559 int res_size = hardware == MPU401_HW_PC98II ? 4 : 2;
559 mpu->res = request_region(port, res_size, "MPU401 UART"); 560 mpu->res = request_region(port, res_size, "MPU401 UART");