summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-13 15:05:56 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-13 15:05:56 +0100
commitb4583a46ba359ddc8ecf4f87c183b65b96bbc2a2 (patch)
treea51c7b5e78b0af0e713f49606fddd5c8b46166ba
parentebb88024aa1b14a86ecc3a9da013f6713664d94b (diff)
parent32cf9a16f4af01573ddec1eb073111fc20a9d7d4 (diff)
downloadop-kernel-dev-b4583a46ba359ddc8ecf4f87c183b65b96bbc2a2.zip
op-kernel-dev-b4583a46ba359ddc8ecf4f87c183b65b96bbc2a2.tar.gz
Merge branch 'fix/misc' into for-linus
-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 5b89c088..48b64e6 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;
OpenPOWER on IntegriCloud