OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Fix Userspace interface breakage in power/state 

Prevent passing invalid values down to the drivers.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pavel Machek 2006-01-22 22:38:52 +01:00 committed by Greg Kroah-Hartman
parent 68f5f99634
commit 022f7b07bf
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/base/power/sysfs.c
View File

@ -27,22 +27,30 @@
static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf) static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
{ {
return sprintf(buf, "%u\n", dev->power.power_state.event); if (dev->power.power_state.event)
return sprintf(buf, "2\n");
else
return sprintf(buf, "0\n");
} }
static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n) static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
{ {
pm_message_t state; pm_message_t state;
char * rest; int error = -EINVAL;
int error = 0;
state.event = simple_strtoul(buf, &rest, 10); state.event = PM_EVENT_SUSPEND;
if (*rest) /* Older apps expected to write "3" here - confused with PCI D3 */
return -EINVAL; if ((n == 1) && !strcmp(buf, "3"))
if (state.event)
error = dpm_runtime_suspend(dev, state); error = dpm_runtime_suspend(dev, state);
else
if ((n == 1) && !strcmp(buf, "2"))
error = dpm_runtime_suspend(dev, state);
if ((n == 1) && !strcmp(buf, "0")) {
dpm_runtime_resume(dev); dpm_runtime_resume(dev);
error = 0;
}
return error ? error : n; return error ? error : n;
} }