diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:09:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:09:02 +0100 |
| commit | 8f0cb147b2fb12427bf6abef7fed2b604557a41e (patch) | |
| tree | fb5ba437ee74b900fab9686c8c7df18abcd7640b /sound/drivers/opl3/opl3_lib.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 (diff) | |
| parent | [ALSA] version 1.0.10rc3 (diff) | |
| download | linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.tar.xz linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/drivers/opl3/opl3_lib.c')
| -rw-r--r-- | sound/drivers/opl3/opl3_lib.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c index 1f84d78260de..06246503083c 100644 --- a/sound/drivers/opl3/opl3_lib.c +++ b/sound/drivers/opl3/opl3_lib.c @@ -325,14 +325,8 @@ static int snd_opl3_free(opl3_t *opl3) snd_assert(opl3 != NULL, return -ENXIO); if (opl3->private_free) opl3->private_free(opl3); - if (opl3->res_l_port) { - release_resource(opl3->res_l_port); - kfree_nocheck(opl3->res_l_port); - } - if (opl3->res_r_port) { - release_resource(opl3->res_r_port); - kfree_nocheck(opl3->res_r_port); - } + release_and_free_resource(opl3->res_l_port); + release_and_free_resource(opl3->res_r_port); kfree(opl3); return 0; } |