From 9ea2bbec5b1a76fdf51e7a13d8a3b5a3a6dc5e6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Wed, 4 Sep 2013 12:18:16 +0200 Subject: [PATCH] Fix dangling if statement in patch power-supply-no-verbose.diff Thanks FatPhil for reporting bug and providing this patch --- .../debian/patches/power-supply-no-verbose.diff | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel-power-2.6.28/debian/patches/power-supply-no-verbose.diff b/kernel-power-2.6.28/debian/patches/power-supply-no-verbose.diff index 8e81fdf..d93bd91 100644 --- a/kernel-power-2.6.28/debian/patches/power-supply-no-verbose.diff +++ b/kernel-power-2.6.28/debian/patches/power-supply-no-verbose.diff @@ -1,13 +1,16 @@ --- kernel-power/drivers/power/power_supply_sysfs.c 2012-01-28 02:03:53.273467047 +0100 +++ kernel-power/drivers/power/power_supply_sysfs.c 2012-01-28 02:04:20.085466262 +0100 -@@ -60,8 +60,8 @@ static ssize_t power_supply_show_propert +@@ -58,12 +58,8 @@ static ssize_t power_supply_show_property(struct device *dev, - if (ret < 0) { - if (ret != -ENODEV) + ret = psy->get_property(psy, off, &value); + +- if (ret < 0) { +- if (ret != -ENODEV) - dev_err(dev, "driver failed to report `%s' property\n", - attr->attr.name); -+/* dev_err(dev, "driver failed to report `%s' property\n", -+ attr->attr.name);*/ ++ if (ret < 0) return ret; - } +- } + if (off == POWER_SUPPLY_PROP_STATUS) + return sprintf(buf, "%s\n", status_text[value.intval]); -- 1.7.9.5