Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 13 Feb 2009 14:05:56 +0000 (15:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 13 Feb 2009 14:05:56 +0000 (15:05 +0100)
sound/drivers/mtpav.c

index 5b89c0883d6081b8d5b8b854d72585ef345f6c55..48b64e6b26701e14ace4015b5df08b7f56408d5a 100644 (file)
@@ -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;