Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 69e09a1b62a406a2c8b319112fc0e5180fa83fe5..1c617623c8ae80e2d72e11532120a4a9723a1c21 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -139,6 +139,8 @@ static ssize_t show_mem_removable(struct device *dev,
        struct memory_block *mem = to_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);
        }