Permalink
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile

Solved conflicting merge
  • Loading branch information...
2 parents dbeec00 + 3291e39 commit 3abfe3614d862cab48510a581ef638c3fa956c32 @ArchangeGabriel ArchangeGabriel committed Sep 21, 2011
Showing with 7 additions and 4 deletions.
  1. +2 −2 Makefile
  2. +4 −1 README
  3. +1 −1 acpi_call.c
View
@@ -11,5 +11,5 @@ clean:
$(MAKE) -C $(KDIR) M=$(PWD) clean
load:
- -/sbin/rmmod acpi_call
- /sbin/insmod acpi_call.ko
+ -/sbin/rmmod acpi_call
+ /sbin/insmod acpi_call.ko
View
@@ -3,7 +3,10 @@ name followed by arguments to /proc/acpi/call.
Usage:
-echo '<call>' > /proc/acpi/call
+ echo '<call>' | sudo tee /proc/acpi/call
+You can then retrieve the result of the call by checking your dmesg or:
+
+ sudo cat /proc/acpi/call
You can pass parameters to acpi_call by writing them after the method,
separated by single space. Currently, you can pass the following parameter
View
@@ -247,7 +247,7 @@ static int acpi_proc_read(char *page, char **start, off_t off,
/** module initialization function */
static int __init init_acpi_call(void)
{
- struct proc_dir_entry *acpi_entry = create_proc_entry("call", 0666, acpi_root_dir);
+ struct proc_dir_entry *acpi_entry = create_proc_entry("call", 0660, acpi_root_dir);
strcpy(result_buffer, "not called");

0 comments on commit 3abfe36

Please sign in to comment.