diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:34 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:34 -0400 |
| commit | 71b43ca46fc5f0588ef64a14c6133c19a9b3f1ea (patch) | |
| tree | af25c06aa1af3ff2c210fe4b39abfdda55b84349 /drivers/acpi/utilities/utmisc.c | |
| parent | 3dd6786f55219f87fd33e153669600d715ca9270 (diff) | |
| parent | fd3509436fde38d4c854bf5a6b83d2c779904f8e (diff) | |
Pull acpica into release branch
Diffstat (limited to 'drivers/acpi/utilities/utmisc.c')
| -rw-r--r-- | drivers/acpi/utilities/utmisc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c index 50133fffe420..2d19f71e9cfa 100644 --- a/drivers/acpi/utilities/utmisc.c +++ b/drivers/acpi/utilities/utmisc.c | |||
| @@ -802,9 +802,8 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer) | |||
| 802 | 802 | ||
| 803 | valid_digits++; | 803 | valid_digits++; |
| 804 | 804 | ||
| 805 | if (sign_of0x | 805 | if (sign_of0x && ((valid_digits > 16) |
| 806 | && ((valid_digits > 16) | 806 | || ((valid_digits > 8) && mode32))) { |
| 807 | || ((valid_digits > 8) && mode32))) { | ||
| 808 | /* | 807 | /* |
| 809 | * This is to_integer operation case. | 808 | * This is to_integer operation case. |
| 810 | * No any restrictions for string-to-integer conversion, | 809 | * No any restrictions for string-to-integer conversion, |
| @@ -1049,6 +1048,7 @@ acpi_ut_exception(char *module_name, | |||
| 1049 | acpi_os_vprintf(format, args); | 1048 | acpi_os_vprintf(format, args); |
| 1050 | acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); | 1049 | acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); |
| 1051 | } | 1050 | } |
| 1051 | |||
| 1052 | EXPORT_SYMBOL(acpi_ut_exception); | 1052 | EXPORT_SYMBOL(acpi_ut_exception); |
| 1053 | 1053 | ||
| 1054 | void ACPI_INTERNAL_VAR_XFACE | 1054 | void ACPI_INTERNAL_VAR_XFACE |
