diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 16:35:24 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 16:35:24 +1100 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /sound | |
| parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
| parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/drivers/opl3/opl3_oss.c | 2 | ||||
| -rw-r--r-- | sound/isa/cs423x/cs4236.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c index 31f1f2e25aa..0345ae64768 100644 --- a/sound/drivers/opl3/opl3_oss.c +++ b/sound/drivers/opl3/opl3_oss.c @@ -146,7 +146,7 @@ void snd_opl3_init_seq_oss(struct snd_opl3 *opl3, char *name) void snd_opl3_free_seq_oss(struct snd_opl3 *opl3) { if (opl3->oss_seq_dev) { - snd_device_free(opl3->card, opl3->oss_seq_dev); + /* The instance should have been released in prior */ opl3->oss_seq_dev = NULL; } } diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 4fa43104056..99a42138bea 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 } /* MPU initialization */ if (acard->mpu && mpu_port[dev] > 0) { - if (snd_cs423x_pnp_init_mpu(dev, acard->ctrl, cfg) < 0) + if (snd_cs423x_pnp_init_mpu(dev, acard->mpu, cfg) < 0) goto error; } kfree(cfg); |