diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 08:09:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 08:09:02 -0800 |
| commit | 8f0cb147b2fb12427bf6abef7fed2b604557a41e (patch) | |
| tree | fb5ba437ee74b900fab9686c8c7df18abcd7640b /sound/pci/emu10k1/emu10k1x.c | |
| parent | 8e33ba49765484bc6de3a2f8143733713fa93bc1 (diff) | |
| parent | b00e8443c3eece823052d06ae1c7cb797ab0ddf5 (diff) | |
| download | op-kernel-dev-8f0cb147b2fb12427bf6abef7fed2b604557a41e.zip op-kernel-dev-8f0cb147b2fb12427bf6abef7fed2b604557a41e.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/pci/emu10k1/emu10k1x.c')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index ad15755..cbb6894 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c @@ -759,10 +759,8 @@ static int snd_emu10k1x_free(emu10k1x_t *chip) outl(HCFG_LOCKSOUNDCACHE, chip->port + HCFG); // release the i/o port - if (chip->res_port) { - release_resource(chip->res_port); - kfree_nocheck(chip->res_port); - } + release_and_free_resource(chip->res_port); + // release the irq if (chip->irq >= 0) free_irq(chip->irq, (void *)chip); |
