diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:49:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:49:05 -0500 |
| commit | cccc65a3b60edaf721cdee5a14f68ba009341822 (patch) | |
| tree | a458d28f70cbe0e848596aad6005442a2621d388 /sound/isa/cs423x/cs4236.c | |
| parent | ba70d0614728892b86b2be2f7eae0c696b436461 (diff) | |
| parent | e95a9ec1bb66e07b138861c743192f06e7b3e4de (diff) | |
Merge branch 'master'
Diffstat (limited to 'sound/isa/cs423x/cs4236.c')
| -rw-r--r-- | sound/isa/cs423x/cs4236.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 4fa431040564..99a42138bea0 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
| @@ -414,7 +414,7 @@ static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard | |||
| 414 | } | 414 | } |
| 415 | /* MPU initialization */ | 415 | /* MPU initialization */ |
| 416 | if (acard->mpu && mpu_port[dev] > 0) { | 416 | if (acard->mpu && mpu_port[dev] > 0) { |
| 417 | if (snd_cs423x_pnp_init_mpu(dev, acard->ctrl, cfg) < 0) | 417 | if (snd_cs423x_pnp_init_mpu(dev, acard->mpu, cfg) < 0) |
| 418 | goto error; | 418 | goto error; |
| 419 | } | 419 | } |
| 420 | kfree(cfg); | 420 | kfree(cfg); |