summaryrefslogtreecommitdiff
path: root/drivers/base/memory.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-06 17:31:06 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-06 17:31:06 -0800
commitefbc57c0e6a92083fce03927736f5d389182935b (patch)
tree2e900ae80abfd296a6f0c0c3a7e6c1ae95ae2705 /drivers/base/memory.c
parent4b1af853646ca893fa686701d1605998fffcc82c (diff)
parent57c80e8e5d1cddae0651e5314394e6069ebbbe3c (diff)
Merge branch 'goodix' into next
Merge several improvements to Goodix touchscreen driver: - power management support - configuration upload - axis swapping and inversion
Diffstat (limited to 'drivers/base/memory.c')
-rw-r--r--drivers/base/memory.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 2804aed3f416..25425d3f2575 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -303,6 +303,10 @@ static int memory_subsys_offline(struct device *dev)
if (mem->state == MEM_OFFLINE)
return 0;
+ /* Can't offline block with non-present sections */
+ if (mem->section_count != sections_per_block)
+ return -EINVAL;
+
return memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE);
}