acpi: get_throttling_state() cannot be larger than state_count
PATCH 4/8 acpi: get_throttling_state() cannot be larger than state_count
From: Roel Kluin <[email protected]>
With for(i = 0; i < n; i++) { ... } i reaches n.
---
drivers/acpi/processor_throttling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/processor_throttling.c renamed from drivers/acpi/processor_throttling.c~acpi-get_throttling_state-cannot-be-larger-state_count +1 -1
@@ -785,7 +785,7 @@ static int acpi_get_throttling_state(strif (tx->control == value)break ; } -if (i > pr->throttling.state_count) +if (i >= pr->throttling.state_count) i =-1 ;return i; }
_
Len Brown
reviewer--
Len Brown, Intel Open Source Technology Center
Quoted 25 lines · On Wed, 4 Mar 2009, [email protected] wrote:
From: Roel Kluin <[email protected]>
With for(i = 0; i < n; i++) { ... } i reaches n.
Signed-off-by Roel Kluin <[email protected]>Acked-by <[email protected]>Cc Len Brown <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/acpi/processor_throttling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff -puN
drivers/acpi/processor_throttling.c~acpi-get_throttling_state-cannot-be-larger-state_countdrivers/acpi/processor_throttling.cdrivers/acpi/processor_throttling.c renamed from drivers/acpi/processor_throttling.c~acpi-get_throttling_state-cannot-be-larger-state_count +1
-1@@ -785,7 +785,7 @@ static int acpi_get_throttling_state(strif (tx->control == value)break ; } -if (i > pr->throttling.state_count) +if (i >= pr->throttling.state_count) i =-1 ;return i; }
Quoted 2 lines
_
how about simply...
drivers/acpi/processor_throttling.c +2 -4
@@ -783,11 +783,9 @@ static int acpi_get_throttling_state(struct acpi_processor *pr, (struct acpi_processor_tx_tss *)&(pr->throttling. states_tss[i]);if (tx->control == value) -break ; +return i; } -if (i > pr->throttling.state_count) - i =-1 ; -return i; +return -1 ; } static int acpi_get_throttling_value(struct acpi_processor *pr,
Quoted 19 lines · Len Brown
--
Len Brown, Intel Open Source Technology CenterQuoted 13 lines · On Wed, 4 Mar 2009, [email protected] wrote:
From: Roel Kluin <[email protected]>
With for(i = 0; i < n; i++) { ... } i reaches n.
Signed-off-by Roel Kluin <[email protected]>Acked-by <[email protected]>Cc Len Brown <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/acpi/processor_throttling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
Quoted 12 lines
diff -puN
drivers/acpi/processor_throttling.c~acpi-get_throttling_state-cannot-be-larger-state_countdrivers/acpi/processor_throttling.cdrivers/acpi/processor_throttling.c renamed from drivers/acpi/processor_throttling.c~acpi-get_throttling_state-cannot-be-larger-state_count +1
-1@@ -785,7 +785,7 @@ static int acpi_get_throttling_state(strif (tx->control == value)break ; } -if (i > pr->throttling.state_count) +if (i >= pr->throttling.state_count) i =-1 ;return i; }Quoted 2 lines
_
how about simply...
It is OK to me.
Quoted 19 lines
drivers/acpi/processor_throttling.c +2
-4@@ -783,11 +783,9 @@ static int acpi_get_throttling_state(struct acpi_processor *pr, (struct acpi_processor_tx_tss *)&(pr->throttling. states_tss[i]);if (tx->control == value) -break ; +return i; } -if (i > pr->throttling.state_count) - i =-1 ; -return i; +return -1 ; } static int acpi_get_throttling_value(struct acpi_processor *pr,
Len Brown
reviewerAndrew,
you'll want to drop this one from your series
b/c I checked in the simpler version.
thanks,
Len Brown, Intel Open Source Technology Center
Quoted 27 lines · On Wed, 4 Mar 2009, [email protected] wrote:
From: Roel Kluin <[email protected]>
With for(i = 0; i < n; i++) { ... } i reaches n.
Signed-off-by Roel Kluin <[email protected]>Acked-by <[email protected]>Cc Len Brown <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/acpi/processor_throttling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff -puN
drivers/acpi/processor_throttling.c~acpi-get_throttling_state-cannot-be-larger-state_countdrivers/acpi/processor_throttling.cdrivers/acpi/processor_throttling.c renamed from drivers/acpi/processor_throttling.c~acpi-get_throttling_state-cannot-be-larger-state_count +1
-1@@ -785,7 +785,7 @@ static int acpi_get_throttling_state(strif (tx->control == value)break ; } -if (i > pr->throttling.state_count) +if (i >= pr->throttling.state_count) i =-1 ;return i; }_