summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-29 18:05:06 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-29 18:05:06 +0200
commit7d489c460ee798be16ca135276fe23262baf038c (patch)
tree6f0fb9badb0ddbc51e0d081c680121d0c313212b /sound
parent0baddbc895a8646b8ce28473897cfb7bb212d4ef (diff)
parentc2a30d711852e4f39c8a79135b3caa701f7a8e02 (diff)
downloadop-kernel-dev-7d489c460ee798be16ca135276fe23262baf038c.zip
op-kernel-dev-7d489c460ee798be16ca135276fe23262baf038c.tar.gz
Merge branch 'fix/misc' into for-linus
* fix/misc: ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/cmi8330.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index de83608..3ee0269 100644
--- 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;
OpenPOWER on IntegriCloud