[PATCH] ACPI: suspend: clear leftovers from S4BIOS.

[PATCH] ACPI: suspend: clear leftovers from S4BIOS.

[Alexey Starikovskiy]

S4BIOS is not supported, so there is no reason to expect 
it as input and try to do something wrong.

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 drivers/acpi/sleep/main.c |    2 --
 drivers/acpi/sleep/proc.c |    5 -----
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 293a1cb..3e85a68 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -403,8 +403,6 @@ int acpi_suspend(u32 acpi_state)
 
 	if (acpi_state < 6 && states[acpi_state])
 		return pm_suspend(states[acpi_state]);
-	if (acpi_state == 4)
-		return hibernate();
 	return -EINVAL;
 }
 
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index f8df521..f530757 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -60,11 +60,6 @@ acpi_system_write_sleep(struct file *file,
 	if (copy_from_user(str, buffer, count))
 		return -EFAULT;
 
-	/* Check for S4 bios request */
-	if (!strcmp(str, "4b")) {
-		error = acpi_suspend(4);
-		goto Done;
-	}
 	state = simple_strtoul(str, NULL, 0);
 #ifdef CONFIG_HIBERNATION
 	if (state == 4) {

Re: [PATCH] ACPI: suspend: clear leftovers from S4BIOS.

[Rafael J. Wysocki]

On Thursday, 21 of February 2008, Alexey Starikovskiy wrote:
> S4BIOS is not supported, so there is no reason to expect 
> it as input and try to do something wrong.
> 
> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

> ---
> 
>  drivers/acpi/sleep/main.c |    2 --
>  drivers/acpi/sleep/proc.c |    5 -----
>  2 files changed, 0 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
> index 293a1cb..3e85a68 100644
> --- a/drivers/acpi/sleep/main.c
> +++ b/drivers/acpi/sleep/main.c
> @@ -403,8 +403,6 @@ int acpi_suspend(u32 acpi_state)
>  
>  	if (acpi_state < 6 && states[acpi_state])
>  		return pm_suspend(states[acpi_state]);
> -	if (acpi_state == 4)
> -		return hibernate();
>  	return -EINVAL;
>  }
>  
> diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
> index f8df521..f530757 100644
> --- a/drivers/acpi/sleep/proc.c
> +++ b/drivers/acpi/sleep/proc.c
> @@ -60,11 +60,6 @@ acpi_system_write_sleep(struct file *file,
>  	if (copy_from_user(str, buffer, count))
>  		return -EFAULT;
>  
> -	/* Check for S4 bios request */
> -	if (!strcmp(str, "4b")) {
> -		error = acpi_suspend(4);
> -		goto Done;
> -	}
>  	state = simple_strtoul(str, NULL, 0);
>  #ifdef CONFIG_HIBERNATION
>  	if (state == 4) {
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 



-- 
"Premature optimization is the root of all evil." - Donald Knuth