diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-11 18:06:42 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-11 18:06:42 -0500 |
commit | 32cf9a16f4af01573ddec1eb073111fc20a9d7d4 (patch) | |
tree | 6404826ae612e406e2e771b548800b6c458a2980 /sound | |
parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) |
ALSA: mtpav - Fix initial value for input hwport
Fix the initial value for input hwport. The old value (-1) may cause
Oops when an realtime MIDI byte is received before the input port is
explicitly given.
Instead, now it's set to the broadcasting as default.
Tested-by: Holger Dehnhardt <dehnhardt@ahdehnhardt.de>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/drivers/mtpav.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index 5b89c0883d60..48b64e6b2670 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c | |||
@@ -706,7 +706,6 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev) | |||
706 | mtp_card->card = card; | 706 | mtp_card->card = card; |
707 | mtp_card->irq = -1; | 707 | mtp_card->irq = -1; |
708 | mtp_card->share_irq = 0; | 708 | mtp_card->share_irq = 0; |
709 | mtp_card->inmidiport = 0xffffffff; | ||
710 | mtp_card->inmidistate = 0; | 709 | mtp_card->inmidistate = 0; |
711 | mtp_card->outmidihwport = 0xffffffff; | 710 | mtp_card->outmidihwport = 0xffffffff; |
712 | init_timer(&mtp_card->timer); | 711 | init_timer(&mtp_card->timer); |
@@ -719,6 +718,8 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev) | |||
719 | if (err < 0) | 718 | if (err < 0) |
720 | goto __error; | 719 | goto __error; |
721 | 720 | ||
721 | mtp_card->inmidiport = mtp_card->num_ports + MTPAV_PIDX_BROADCAST; | ||
722 | |||
722 | err = snd_mtpav_get_ISA(mtp_card); | 723 | err = snd_mtpav_get_ISA(mtp_card); |
723 | if (err < 0) | 724 | if (err < 0) |
724 | goto __error; | 725 | goto __error; |