Commit 7d489c46 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
parents 0baddbc8 c2a30d71
...@@ -338,7 +338,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, ...@@ -338,7 +338,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
return -EBUSY; return -EBUSY;
acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL); acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL);
if (acard->play == NULL) if (acard->mpu == NULL)
return -EBUSY; return -EBUSY;
pdev = acard->cap; pdev = acard->cap;
......
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