diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /sound/isa/es1688 | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
| download | kernel_samsung_smdk4412-a892acacd3a8546ac161526522f13b5174f2c471.tar.gz kernel_samsung_smdk4412-a892acacd3a8546ac161526522f13b5174f2c471.tar.bz2 kernel_samsung_smdk4412-a892acacd3a8546ac161526522f13b5174f2c471.zip | |
Merge branch 'master'
Diffstat (limited to 'sound/isa/es1688')
| -rw-r--r-- | sound/isa/es1688/es1688_lib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index aac898765c0..2edc9c9f044 100644 --- a/sound/isa/es1688/es1688_lib.c +++ b/sound/isa/es1688/es1688_lib.c @@ -606,8 +606,7 @@ static int snd_es1688_free(es1688_t *chip) { if (chip->res_port) { snd_es1688_init(chip, 0); - release_resource(chip->res_port); - kfree_nocheck(chip->res_port); + release_and_free_resource(chip->res_port); } if (chip->irq >= 0) free_irq(chip->irq, (void *) chip); |