48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
|
From ac3a5ee699f3baa7654c93a3ffda46be82443344 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Markos Chandras <markos.chandras@imgtec.com>
|
||
|
|
Date: Wed, 21 Aug 2013 11:47:22 +0100
|
||
|
|
Subject: [PATCH 12/27] MIPS: ath79: Avoid using unitialized 'reg' variable
|
||
|
|
|
||
|
|
Fixes the following build error:
|
||
|
|
arch/mips/include/asm/mach-ath79/ath79.h:139:20: error: 'reg' may be used
|
||
|
|
uninitialized in this function [-Werror=maybe-uninitialized]
|
||
|
|
arch/mips/ath79/common.c:62:6: note: 'reg' was declared here
|
||
|
|
In file included from arch/mips/ath79/common.c:20:0:
|
||
|
|
arch/mips/ath79/common.c: In function 'ath79_device_reset_clear':
|
||
|
|
arch/mips/include/asm/mach-ath79/ath79.h:139:20:
|
||
|
|
error: 'reg' may be used uninitialized in this function
|
||
|
|
[-Werror=maybe-uninitialized]
|
||
|
|
arch/mips/ath79/common.c:90:6: note: 'reg' was declared here
|
||
|
|
|
||
|
|
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
|
||
|
|
Acked-by: Gabor Juhos <juhosg@openwrt.org>
|
||
|
|
---
|
||
|
|
arch/mips/ath79/common.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c
|
||
|
|
index c782b10ddf50..a32a9181a296 100644
|
||
|
|
--- a/arch/mips/ath79/common.c
|
||
|
|
+++ b/arch/mips/ath79/common.c
|
||
|
|
@@ -106,7 +106,7 @@ void ath79_device_reset_set(u32 mask)
|
||
|
|
else if (soc_is_qca955x())
|
||
|
|
reg = QCA955X_RESET_REG_RESET_MODULE;
|
||
|
|
else
|
||
|
|
- BUG();
|
||
|
|
+ panic("Reset register not defined for this SOC");
|
||
|
|
|
||
|
|
spin_lock_irqsave(&ath79_device_reset_lock, flags);
|
||
|
|
t = ath79_reset_rr(reg);
|
||
|
|
@@ -134,7 +134,7 @@ void ath79_device_reset_clear(u32 mask)
|
||
|
|
else if (soc_is_qca955x())
|
||
|
|
reg = QCA955X_RESET_REG_RESET_MODULE;
|
||
|
|
else
|
||
|
|
- BUG();
|
||
|
|
+ panic("Reset register not defined for this SOC");
|
||
|
|
|
||
|
|
spin_lock_irqsave(&ath79_device_reset_lock, flags);
|
||
|
|
t = ath79_reset_rr(reg);
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|