> NAK, this patch is incorrect > > On Mon, 21 Dec 2009, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > > > From: Roel Kluin <roel.kluin@xxxxxxxxx> > > > > The wrong test was used acpi_status status is unsigned. > > > > Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> > > Acked-by: Jonathan Woithe <jwoithe@xxxxxxxxxxxxxxxxxxxxxxx> > > Cc: Len Brown <lenb@xxxxxxxxxx> > > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > > --- > > > > drivers/platform/x86/fujitsu-laptop.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff -puN drivers/platform/x86/fujitsu-laptop.c~fujitsu-laptop-fix-tests-of-acpi_evaluate_integer-return drivers/platform/x86/fujitsu-laptop.c > > --- a/drivers/platform/x86/fujitsu-laptop.c~fujitsu-laptop-fix-tests-of-acpi_evaluate_integer-return > > +++ a/drivers/platform/x86/fujitsu-laptop.c > > @@ -376,7 +376,7 @@ static int get_lcd_level(void) > > > > status = > > acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state); > > - if (status < 0) > > + if (ACPI_FAILURE(status)) > > return status; > > backlight_show_actual_brightness() will stuff this return value in sysfs > no matter what you return. > > I'm sure we don't want to return an acpi_status. > > Looks like it should return 0 on failure, like thinkpad does. Fair enough. At the time this patch was first proposed there was some confusion as to what the return value should be. We ended up taking a punt and got it wrong. > > fujitsu->brightness_level = state & 0x0fffffff; > > @@ -398,7 +398,7 @@ static int get_max_brightness(void) > > > > status = > > acpi_evaluate_integer(fujitsu->acpi_handle, "RBLL", NULL, &state); > > - if (status < 0) > > + if (ACPI_FAILURE(status)) > > return status; > > needs to be return -1, since show_max_brightness is testing for < 0. Same here. Thanks for the feedback; I'll do up a revised patch in a sec. Regards jonathan -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
