diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-24 01:19:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-24 01:19:00 -0500 |
| commit | fcb11235d3910c39afece52f6e106a9ca565d34b (patch) | |
| tree | 07412f9c367f5f9bf6ad7ccd6fa8146c4aba68af /drivers/platform/x86/fujitsu-laptop.c | |
| parent | 78a5331dddcffabadef024ccc051f7a519b13238 (diff) | |
| parent | 44ef00e6482e755f36629773abc2aee83a6f53e3 (diff) | |
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'drivers/platform/x86/fujitsu-laptop.c')
| -rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index b66029bd75d0..5f3320d468f6 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
| @@ -376,8 +376,8 @@ static int get_lcd_level(void) | |||
| 376 | 376 | ||
| 377 | status = | 377 | status = |
| 378 | acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state); | 378 | acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state); |
| 379 | if (status < 0) | 379 | if (ACPI_FAILURE(status)) |
| 380 | return status; | 380 | return 0; |
| 381 | 381 | ||
| 382 | fujitsu->brightness_level = state & 0x0fffffff; | 382 | fujitsu->brightness_level = state & 0x0fffffff; |
| 383 | 383 | ||
| @@ -398,8 +398,8 @@ static int get_max_brightness(void) | |||
| 398 | 398 | ||
| 399 | status = | 399 | status = |
| 400 | acpi_evaluate_integer(fujitsu->acpi_handle, "RBLL", NULL, &state); | 400 | acpi_evaluate_integer(fujitsu->acpi_handle, "RBLL", NULL, &state); |
| 401 | if (status < 0) | 401 | if (ACPI_FAILURE(status)) |
| 402 | return status; | 402 | return -1; |
| 403 | 403 | ||
| 404 | fujitsu->max_brightness = state; | 404 | fujitsu->max_brightness = state; |
| 405 | 405 | ||