diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 23:19:41 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 23:19:41 +0400 |
| commit | 6e1173399d09aa7ab5db613911e38700b2307ece (patch) | |
| tree | a86e7a294f5648dbc531c9590094492b887fea90 /drivers/hwmon/acpi_power_meter.c | |
| parent | 461c14917e04f76d5efc63ce079798d4ca6c297f (diff) | |
| parent | d7ee11157f1fce02632e2f3a56b99b2afd9e5f93 (diff) | |
| download | linux-6e1173399d09aa7ab5db613911e38700b2307ece.tar.xz | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon patches from Guenter Roeck:
"Fix build warnings in four drivers"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (pmbus_core) Fix compiler warning
hwmon: (smsc47m1) Fix compiler warning
hwmon: (acpi_power_meter) Fix compiler warning seen in some configurations
hwmon: (smsc47b397) Fix compiler warning
Diffstat (limited to 'drivers/hwmon/acpi_power_meter.c')
| -rw-r--r-- | drivers/hwmon/acpi_power_meter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 145f13580ff0..9140236a0182 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/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); |