diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-08 11:14:20 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-08 11:14:20 +1100 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /sound/pci/emu10k1/emu10k1x.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
| download | blackbird-op-linux-24bfb00123e82a2e70bd115277d922438813515b.tar.gz blackbird-op-linux-24bfb00123e82a2e70bd115277d922438813515b.zip | |
Merge ../linux-2.6
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 ad15755a63c3..cbb689474e7d 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); |
