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);