summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2014-07-30 12:20:26 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-31 00:50:22 +0200
commit8884de6a47dda88f8fdf4efa9960149fb5a8a46f (patch)
tree2e15b3feb388a577b1395822ae1feef8f6ac8c1d /drivers/acpi
parentc12f07d17c12193256a99e20c9a0f130fb8f7be8 (diff)
downloadlinux-8884de6a47dda88f8fdf4efa9960149fb5a8a46f.tar.bz2
ACPICA: Work around an ancient GCC bug.
warning: cast from function call of type 'char *' to non-matching type 'long unsigned int' Since acpi_ut_format_number() hasn't been enabled for the Linux kernel, this patch doesn't affect the Linux kernel. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/utprint.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c
index 10311648f701..080e22aaba15 100644
--- a/drivers/acpi/acpica/utprint.c
+++ b/drivers/acpi/acpica/utprint.c
@@ -242,6 +242,7 @@ static char *acpi_ut_format_number(char *string,
u64 number,
u8 base, s32 width, s32 precision, u8 type)
{
+ char *pos;
char sign;
char zero;
u8 need_prefix;
@@ -289,9 +290,8 @@ static char *acpi_ut_format_number(char *string,
/* Generate full string in reverse order */
- i = ACPI_PTR_DIFF(acpi_ut_put_number
- (reversed_string, number, base, upper),
- reversed_string);
+ pos = acpi_ut_put_number(reversed_string, number, base, upper);
+ i = ACPI_PTR_DIFF(pos, reversed_string);
/* Printing 100 using %2d gives "100", not "00" */