summaryrefslogtreecommitdiff
path: root/sound/drivers/serial-u16550.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-09 09:20:26 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-09 09:20:26 +0300
commitc7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch)
tree1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /sound/drivers/serial-u16550.c
parent8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff)
parent8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff)
downloadlinux-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.tar.xz
Merge branch 'upstream'
Diffstat (limited to 'sound/drivers/serial-u16550.c')
-rw-r--r--sound/drivers/serial-u16550.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 416172ea1f47..1ed58df42671 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -749,10 +749,7 @@ static int snd_uart16550_free(snd_uart16550_t *uart)
{
if (uart->irq >= 0)
free_irq(uart->irq, (void *)uart);
- if (uart->res_base) {
- release_resource(uart->res_base);
- kfree_nocheck(uart->res_base);
- }
+ release_and_free_resource(uart->res_base);
kfree(uart);
return 0;
};