Merge branch 'acpica'

* acpica:
  ACPICA: Update version to 20140724.
  ACPICA: ACPI 5.1: Update for PCCT table changes.
  ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
  ACPICA/ARM: ACPI 5.1: Update for MADT changes.
  ACPICA/ARM: ACPI 5.1: Update for FADT changes.
  ACPICA: ACPI 5.1: Support for the _CCA predifined name.
  ACPICA: ACPI 5.1: New notify value for System Affinity Update.
  ACPICA: ACPI 5.1: Support for the _DSD predefined name.
  ACPICA: Debug object: Add current value of Timer() to debug line prefix.
  ACPICA: acpihelp: Add UUID support, restructure some existing files.
  ACPICA: Utilities: Fix local printf issue.
  ACPICA: Tables: Update for DMAR table changes.
  ACPICA: Remove some extraneous printf arguments.
  ACPICA: Update for comments/formatting. No functional changes.
  ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
  ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
  ACPICA: Work around an ancient GCC bug.

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/acpi/acpica/utprint.c b/drivers/acpi/acpica/utprint.c
index 10311648f701..0ce3f5a0dd67 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" */
 
@@ -401,6 +401,7 @@ acpi_ut_vsnprintf(char *string,
 
                 /* Process width */
 
+                width = -1;
                 if (ACPI_IS_DIGIT(*format)) {
                         format = acpi_ut_scan_number(format, &number);
                         width = (s32) number;
@@ -415,6 +416,7 @@ acpi_ut_vsnprintf(char *string,
 
                 /* Process precision */
 
+                precision = -1;
                 if (*format == '.') {
                         ++format;
                         if (ACPI_IS_DIGIT(*format)) {
@@ -431,6 +433,7 @@ acpi_ut_vsnprintf(char *string,
 
                 /* Process qualifier */
 
+                qualifier = -1;
                 if (*format == 'h' || *format == 'l' || *format == 'L') {
                         qualifier = *format;
                         ++format;