Commit 83f11a9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.12-rc6' of...

Merge tag 'driver-core-3.12-rc6' of git://

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://
  driver core: Release device_hotplug_lock when store_mem_state returns EINVAL
parents 02a3250f a37f8630
......@@ -333,8 +333,10 @@ store_mem_state(struct device *dev,
online_type = ONLINE_KEEP;
else if (!strncmp(buf, "offline", min_t(int, count, 7)))
online_type = -1;
return -EINVAL;
else {
ret = -EINVAL;
goto err;
switch (online_type) {
......@@ -357,6 +359,7 @@ store_mem_state(struct device *dev,
ret = -EINVAL; /* should never happen */
if (ret)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment