| commit | 7d489c460ee798be16ca135276fe23262baf038c | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Jun 29 18:05:06 2009 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Jun 29 18:05:06 2009 +0200 |
| tree | 6f0fb9badb0ddbc51e0d081c680121d0c313212b | |
| parent | 0baddbc895a8646b8ce28473897cfb7bb212d4ef [diff] | |
| parent | c2a30d711852e4f39c8a79135b3caa701f7a8e02 [diff] |
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 de83608..3ee0269 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c
@@ -338,7 +338,7 @@ 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;