diff options
| author | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
| commit | d1208404dd477c142680437137c9996b95bfd508 (patch) | |
| tree | 0cba53f59f487c0de2b1a0d9fb1b11ae27de96ec /drivers/base/memory.c | |
| parent | afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2 (diff) | |
| parent | afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff) | |
| download | talos-op-linux-d1208404dd477c142680437137c9996b95bfd508.tar.gz talos-op-linux-d1208404dd477c142680437137c9996b95bfd508.zip | |
Merge tag 'v4.4'
Linux 4.4
Diffstat (limited to 'drivers/base/memory.c')
| -rw-r--r-- | drivers/base/memory.c | 4 |
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); } |
