Commit b4583a46 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'fix/misc' into for-linus

parents ebb88024 32cf9a16
...@@ -706,7 +706,6 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev) ...@@ -706,7 +706,6 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
mtp_card->card = card; mtp_card->card = card;
mtp_card->irq = -1; mtp_card->irq = -1;
mtp_card->share_irq = 0; mtp_card->share_irq = 0;
mtp_card->inmidiport = 0xffffffff;
mtp_card->inmidistate = 0; mtp_card->inmidistate = 0;
mtp_card->outmidihwport = 0xffffffff; mtp_card->outmidihwport = 0xffffffff;
init_timer(&mtp_card->timer); init_timer(&mtp_card->timer);
...@@ -719,6 +718,8 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev) ...@@ -719,6 +718,8 @@ static int __devinit snd_mtpav_probe(struct platform_device *dev)
if (err < 0) if (err < 0)
goto __error; goto __error;
mtp_card->inmidiport = mtp_card->num_ports + MTPAV_PIDX_BROADCAST;
err = snd_mtpav_get_ISA(mtp_card); err = snd_mtpav_get_ISA(mtp_card);
if (err < 0) if (err < 0)
goto __error; goto __error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment