diff mbox

s3: fix multiple s3 tests stop working (LP: #1359037)

Message ID 1408513182-16219-1-git-send-email-ivan.hu@canonical.com
State Accepted
Headers show

Commit Message

Ivan Hu Aug. 20, 2014, 5:39 a.m. UTC
fwts s3 --s3-multiple=30 can only do twice or thrice, and then it stops working.

Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
---
 src/acpi/s3/s3.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Keng-Yu Lin Aug. 20, 2014, 6:20 a.m. UTC | #1
On Wed, Aug 20, 2014 at 1:39 PM, Ivan Hu <ivan.hu@canonical.com> wrote:
> fwts s3 --s3-multiple=30 can only do twice or thrice, and then it stops working.
>
> Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
> ---
>  src/acpi/s3/s3.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c
> index 7ad4e5f..411d243 100644
> --- a/src/acpi/s3/s3.c
> +++ b/src/acpi/s3/s3.c
> @@ -456,7 +456,7 @@ static int s3_test_multiple(fwts_framework *fw)
>                         tv.tv_usec = (awake_delay % 1000)*1000;
>                         select(0, NULL, NULL, NULL, &tv);
>
> -                       for (j = 0; j < awake_delay / 1000; i++) {
> +                       for (j = 0; j < awake_delay / 1000; j++) {
>                                 snprintf(buffer, sizeof(buffer), "(Waiting %d/%d seconds)",
>                                         j + 1, awake_delay / 1000);
>                                 fwts_progress_message(fw, percent, buffer);
> --
> 1.7.9.5
>
>

Ivan thanks. :-)

Acked-by: Keng-Yu Lin <kengyu@canonical.com>
Colin Ian King Aug. 20, 2014, 7:35 a.m. UTC | #2
On 20/08/14 06:39, Ivan Hu wrote:
> fwts s3 --s3-multiple=30 can only do twice or thrice, and then it stops working.
> 
> Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
> ---
>  src/acpi/s3/s3.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c
> index 7ad4e5f..411d243 100644
> --- a/src/acpi/s3/s3.c
> +++ b/src/acpi/s3/s3.c
> @@ -456,7 +456,7 @@ static int s3_test_multiple(fwts_framework *fw)
>  			tv.tv_usec = (awake_delay % 1000)*1000;
>  			select(0, NULL, NULL, NULL, &tv);
>  
> -			for (j = 0; j < awake_delay / 1000; i++) {
> +			for (j = 0; j < awake_delay / 1000; j++) {
>  				snprintf(buffer, sizeof(buffer), "(Waiting %d/%d seconds)",
>  					j + 1, awake_delay / 1000);
>  				fwts_progress_message(fw, percent, buffer);
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
Kun Yang Aug. 20, 2014, 7:50 a.m. UTC | #3

diff mbox

Patch

diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c
index 7ad4e5f..411d243 100644
--- a/src/acpi/s3/s3.c
+++ b/src/acpi/s3/s3.c
@@ -456,7 +456,7 @@  static int s3_test_multiple(fwts_framework *fw)
 			tv.tv_usec = (awake_delay % 1000)*1000;
 			select(0, NULL, NULL, NULL, &tv);
 
-			for (j = 0; j < awake_delay / 1000; i++) {
+			for (j = 0; j < awake_delay / 1000; j++) {
 				snprintf(buffer, sizeof(buffer), "(Waiting %d/%d seconds)",
 					j + 1, awake_delay / 1000);
 				fwts_progress_message(fw, percent, buffer);