summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-04-20 13:18:36 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:14:51 +0200
commit8c912ebea9bb34ba4d007c2adf1a7ab9a97e2f38 (patch)
tree97e1ce22ae5d793cca161add0adc549fa83fa18f
parentad82f15908f0eaa8caf08ed7697c93815ed486a0 (diff)
Warnings fix in wdt & b2r2
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--drivers/video/b2r2/b2r2_node_split.c4
-rw-r--r--drivers/watchdog/mpcore_wdt.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/b2r2/b2r2_node_split.c b/drivers/video/b2r2/b2r2_node_split.c
index c7ce0572d11..1ffc3d688ef 100644
--- a/drivers/video/b2r2/b2r2_node_split.c
+++ b/drivers/video/b2r2/b2r2_node_split.c
@@ -1450,8 +1450,8 @@ static int configure_sub_rot(struct b2r2_node *node,
struct b2r2_blt_rect src_win;
struct b2r2_blt_rect dst_win;
- u32 y_pixels;
- u32 x_pixels;
+ u32 y_pixels = 0;
+ u32 x_pixels = 0;
memcpy(&src_win, &src->win, sizeof(src_win));
memcpy(&dst_win, &dst->win, sizeof(dst_win));
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 818e453add9..a75c43922e9 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -38,7 +38,7 @@
#include <asm/smp_twd.h>
struct mpcore_wdt {
- unsigned long timer_alive;
+ cpumask_t timer_alive;
struct device *dev;
void __iomem *base;
int irq;