Merge branch 'fix/misc' into for-linus

* fix/misc: ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
josf · Jun 29, 2009 · 7d489c4 · 7d489c4
2 parents 0baddbc + c2a30d7
commit 7d489c4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;