diff options
| -rw-r--r-- | drivers/video/b2r2/b2r2_node_split.c | 4 | ||||
| -rw-r--r-- | drivers/watchdog/mpcore_wdt.c | 2 |
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; |