Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug

diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index de83608719ea23138a793e2c557444add2f4001e..3ee0269e5bd08376fa47bf94731459b9ac4e0d03 100644 (file)
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -338,7 +338,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
                return -EBUSY;
 
        acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL);
-       if (acard->play == NULL)
+       if (acard->mpu == NULL)
                return -EBUSY;
 
        pdev = acard->cap;