Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c
index 3891124001f2..a844810b50f6 100644
--- 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;
         }