diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-15 09:00:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-15 09:00:18 +0100 |
| commit | b69bc3967445169ea4dc11171118b414eafab271 (patch) | |
| tree | 52bff205f1fc1dbcae5aba7531c5b53f52b4823e /sound/drivers | |
| parent | c466ed2e4337c5eb03b283da507eb5328ab06c73 (diff) | |
| parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
| download | linux-3.10-b69bc3967445169ea4dc11171118b414eafab271.tar.gz linux-3.10-b69bc3967445169ea4dc11171118b414eafab271.tar.bz2 linux-3.10-b69bc3967445169ea4dc11171118b414eafab271.zip | |
Merge commit 'v2.6.29-rc5' into x86/apic
Diffstat (limited to 'sound/drivers')
| -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 5b89c0883d6..48b64e6b267 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; |