projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
sound
/
isa
/
opl3sa2.c
diff --git
a/sound/isa/opl3sa2.c
b/sound/isa/opl3sa2.c
index
4ba268f
..
47cabda
100644
(file)
--- a/
sound/isa/opl3sa2.c
+++ b/
sound/isa/opl3sa2.c
@@
-656,10
+656,7
@@
static int snd_opl3sa2_free(opl3sa2_t *chip)
{
if (chip->irq >= 0)
free_irq(chip->irq, (void *)chip);
- if (chip->res_port) {
- release_resource(chip->res_port);
- kfree_nocheck(chip->res_port);
- }
+ release_and_free_resource(chip->res_port);
kfree(chip);
return 0;
}