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) | |
| download | blackbird-op-linux-fcb11235d3910c39afece52f6e106a9ca565d34b.tar.gz blackbird-op-linux-fcb11235d3910c39afece52f6e106a9ca565d34b.zip | |
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) status = acpi_evaluate_integer(fujitsu->acpi_handle, "GBLL", NULL, &state); - if (status < 0) - return status; + if (ACPI_FAILURE(status)) + return 0; fujitsu->brightness_level = state & 0x0fffffff; @@ -398,8 +398,8 @@ static int get_max_brightness(void) status = acpi_evaluate_integer(fujitsu->acpi_handle, "RBLL", NULL, &state); - if (status < 0) - return status; + if (ACPI_FAILURE(status)) + return -1; fujitsu->max_brightness = state; |
