lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Pull driver core fix from Greg KH:
 "Here is one fix for the hotplug memory path that resolves a regression
  when removing memory that showed up in 3.12-rc1"

* tag 'driver-core-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: Release device_hotplug_lock when store_mem_state returns EINVAL
This commit is contained in:
Linus Torvalds
2013-10-17 10:39:01 -07:00
parent 02a3250fd3 a37f86305c
commit 83f11a9cf2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/base/memory.c
View File

@@ -333,8 +333,10 @@ store_mem_state(struct device *dev,
online_type = ONLINE_KEEP; online_type = ONLINE_KEEP;
else if (!strncmp(buf, "offline", min_t(int, count, 7))) else if (!strncmp(buf, "offline", min_t(int, count, 7)))
online_type = -1; online_type = -1;
else else {
return -EINVAL; ret = -EINVAL;
goto err;
}
switch (online_type) { switch (online_type) {
case ONLINE_KERNEL: case ONLINE_KERNEL:
@@ -357,6 +359,7 @@ store_mem_state(struct device *dev,
ret = -EINVAL; /* should never happen */ ret = -EINVAL; /* should never happen */
} }
err:
unlock_device_hotplug(); unlock_device_hotplug();
if (ret) if (ret)