2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 2b7813ec6d02..ec386ee9cb22 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -141,6 +141,8 @@ static ssize_t show_mem_removable(struct device *dev,
                 container_of(dev, struct memory_block, dev);
 
         for (i = 0; i < sections_per_block; i++) {
+                if (!present_section_nr(mem->start_section_nr + i))
+                        continue;
                 pfn = section_nr_to_pfn(mem->start_section_nr + i);
                 ret &= is_mem_section_removable(pfn, PAGES_PER_SECTION);
         }
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index e9a2261a383b..930cad4e5df8 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -354,7 +354,7 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg)
         }
 
         if (!rbnode->blklen) {
-                rbnode->blklen = sizeof(*rbnode);
+                rbnode->blklen = 1;
                 rbnode->base_reg = reg;
         }