2 files changed, 15 insertions, 4 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 63f04c15e6f5..4448f91b865c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -134,6 +134,17 @@ config SCHEDSTATS
           application, you can say N to avoid the very slight overhead
           this adds.
 
+config TIMER_STATS
+        bool "Collect kernel timers statistics"
+        depends on DEBUG_KERNEL && PROC_FS
+        help
+          If you say Y here, additional code will be inserted into the
+          timer routines to collect statistics about kernel timers being
+          reprogrammed. The statistics can be read from /proc/timer_stats.
+          The statistics collection is started by writing 1 to /proc/timer_stats,
+          writing 0 stops it. This feature is useful to collect information
+          about timer usage patterns in kernel and userspace.
+
 config DEBUG_SLAB
         bool "Debug slab memory allocations"
         depends on DEBUG_KERNEL && SLAB
diff --git a/lib/devres.c b/lib/devres.c
index 2a668dd7cac7..eb38849aa717 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -274,21 +274,21 @@ int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name)
 
                 rc = pci_request_region(pdev, i, name);
                 if (rc)
-                        goto err_region;
+                        goto err_inval;
 
                 rc = -ENOMEM;
                 if (!pcim_iomap(pdev, i, 0))
-                        goto err_iomap;
+                        goto err_region;
         }
 
         return 0;
 
- err_iomap:
-        pcim_iounmap(pdev, iomap[i]);
  err_region:
         pci_release_region(pdev, i);
  err_inval:
         while (--i >= 0) {
+                if (!(mask & (1 << i)))
+                        continue;
                 pcim_iounmap(pdev, iomap[i]);
                 pci_release_region(pdev, i);
         }