diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-29 12:05:06 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-29 12:05:06 -0400 |
| commit | 7d489c460ee798be16ca135276fe23262baf038c (patch) | |
| 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
| -rw-r--r-- | sound/isa/cmi8330.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index de83608719ea..3ee0269e5bd0 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, | |||
| 338 | return -EBUSY; | 338 | return -EBUSY; |
| 339 | 339 | ||
| 340 | acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL); | 340 | acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL); |
| 341 | if (acard->play == NULL) | 341 | if (acard->mpu == NULL) |
| 342 | return -EBUSY; | 342 | return -EBUSY; |
| 343 | 343 | ||
| 344 | pdev = acard->cap; | 344 | pdev = acard->cap; |