summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-12 00:06:42 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-02-17 09:29:02 -0800
commitb9c2ffe4ccafdc6991fe7fd1d3a75f0ce7d5a259 (patch)
tree65cc964aea50dcf19f968bd2e93fe8b42b46f156
parent7a7856eddb9603da697d54d5d3340c020a717364 (diff)
downloadlwn-b9c2ffe4ccafdc6991fe7fd1d3a75f0ce7d5a259.tar.gz
lwn-b9c2ffe4ccafdc6991fe7fd1d3a75f0ce7d5a259.zip
ALSA: mtpav - Fix initial value for input hwport
commit 32cf9a16f4af01573ddec1eb073111fc20a9d7d4 upstream. 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> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--sound/drivers/mtpav.c3
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)
mtp_card->card = card;
mtp_card->irq = -1;
mtp_card->share_irq = 0;
- mtp_card->inmidiport = 0xffffffff;
mtp_card->inmidistate = 0;
mtp_card->outmidihwport = 0xffffffff;
init_timer(&mtp_card->timer);
@@ -719,6 +718,8 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
if (err < 0)
goto __error;
+ mtp_card->inmidiport = mtp_card->num_ports + MTPAV_PIDX_BROADCAST;
+
err = snd_mtpav_get_ISA(mtp_card);
if (err < 0)
goto __error;