diff options
-rw-r--r-- | clocks.c | 8 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | display.c | 5 | ||||
-rw-r--r-- | powerdebug.h | 4 | ||||
-rw-r--r-- | regulator.c | 8 | ||||
-rw-r--r-- | sensor.c | 8 |
6 files changed, 23 insertions, 16 deletions
@@ -405,9 +405,6 @@ int clock_init(void) { char clk_dir_path[PATH_MAX]; - if (display_register(CLOCK, &clock_ops)) - return -1; - if (locate_debugfs(clk_dir_path)) return -1; @@ -420,5 +417,8 @@ int clock_init(void) if (!clock_tree) return -1; - return fill_clock_tree(); + if (fill_clock_tree()) + return -1; + + return display_register(CLOCK, &clock_ops); } diff --git a/debian/changelog b/debian/changelog index 3a86e16..b5818a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +powerdebug (0.5-2011.07-0) natty; urgency=low + + * fixed lp: 802387 + + -- Daniel Lezcano <daniel.lezcano@linaro.org> Mon, 25 Jul 2011 23:25:05 +0200 + powerdebug (0.5-2011.06-0) natty; urgency=low * added tree algorithm @@ -120,7 +120,10 @@ static int display_refresh(int win, bool read) if (windata[win].ops && windata[win].ops->display) return windata[win].ops->display(read); - return 0; + if (werase(main_win)) + return -1; + + return wrefresh(main_win); } int display_refresh_pad(int win) diff --git a/powerdebug.h b/powerdebug.h index 01b22ba..05d919b 100644 --- a/powerdebug.h +++ b/powerdebug.h @@ -13,6 +13,4 @@ * - initial API and implementation *******************************************************************************/ -#define VERSION "0.5.0" - - +#define VERSION "0.5.1" diff --git a/regulator.c b/regulator.c index 849f906..e9b01bb 100644 --- a/regulator.c +++ b/regulator.c @@ -236,12 +236,12 @@ static struct display_ops regulator_ops = { int regulator_init(void) { - if (display_register(REGULATOR, ®ulator_ops)) - return -1; - reg_tree = tree_load(SYSFS_REGULATOR, regulator_filter_cb); if (!reg_tree) return -1; - return fill_regulator_tree(); + if (fill_regulator_tree()) + return -1; + + return display_register(REGULATOR, ®ulator_ops); } @@ -271,12 +271,12 @@ static struct display_ops sensor_ops = { int sensor_init(void) { - if (display_register(SENSOR, &sensor_ops)) - return -1; - sensor_tree = tree_load(SYSFS_SENSOR, sensor_filter_cb); if (!sensor_tree) return -1; - return fill_sensor_tree(); + if (fill_sensor_tree()) + return -1; + + return display_register(SENSOR, &sensor_ops); } |