Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'driver-core-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
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
+5
-2
+5
-2
drivers/base/memory.c
+5
-2
drivers/base/memory.c
···
333
333
online_type = ONLINE_KEEP;
334
334
else if (!strncmp(buf, "offline", min_t(int, count, 7)))
335
335
online_type = -1;
336
-
else
337
-
return -EINVAL;
336
+
else {
337
+
ret = -EINVAL;
338
+
goto err;
339
+
}
338
340
339
341
switch (online_type) {
340
342
case ONLINE_KERNEL:
···
359
357
ret = -EINVAL; /* should never happen */
360
358
}
361
359
360
+
err:
362
361
unlock_device_hotplug();
363
362
364
363
if (ret)