Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / misc / atmel_tclib.c

diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c
index 3891124..a844810 100644 (file)
--- a/drivers/misc/atmel_tclib.c
+++ b/drivers/misc/atmel_tclib.c
@@ -75,7 +75,7 @@ out:
        return tc;
 
 fail_ioremap:
-       release_resource(r);
+       release_mem_region(r->start, ATMEL_TC_IOMEM_SIZE);
 fail:
        tc = NULL;
        goto out;
@@ -95,7 +95,7 @@ void atmel_tc_free(struct atmel_tc *tc)
        spin_lock(&tc_list_lock);
        if (tc->regs) {
                iounmap(tc->regs);
-               release_resource(tc->iomem);
+               release_mem_region(tc->iomem->start, ATMEL_TC_IOMEM_SIZE);
                tc->regs = NULL;
                tc->iomem = NULL;
        }