From 651266bf8423fc9712c7a60083fb0f1ac767cd24 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Wed, 28 Mar 2012 09:03:26 -0700
Subject: [PATCH] --- yaml --- r: 299178 b: refs/heads/master c:
 776cdc11b3b0fc21e34600e22abe1c8209d2f3f0 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/hwmon/acpi_power_meter.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9af4b7e0dd59..0b289910dee6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8528e07edfc6ac5a793509f305b9c3c4fb3672c0
+refs/heads/master: 776cdc11b3b0fc21e34600e22abe1c8209d2f3f0
diff --git a/trunk/drivers/hwmon/acpi_power_meter.c b/trunk/drivers/hwmon/acpi_power_meter.c
index 145f13580ff0..9140236a0182 100644
--- a/trunk/drivers/hwmon/acpi_power_meter.c
+++ b/trunk/drivers/hwmon/acpi_power_meter.c
@@ -391,6 +391,7 @@ static ssize_t show_str(struct device *dev,
 		break;
 	default:
 		BUG();
+		val = "";
 	}
 
 	return sprintf(buf, "%s\n", val);