2
0

0012-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From ac3a5ee699f3baa7654c93a3ffda46be82443344 Mon Sep 17 00:00:00 2001
  2. From: Markos Chandras <[email protected]>
  3. Date: Wed, 21 Aug 2013 11:47:22 +0100
  4. Subject: [PATCH 12/27] MIPS: ath79: Avoid using unitialized 'reg' variable
  5. Fixes the following build error:
  6. arch/mips/include/asm/mach-ath79/ath79.h:139:20: error: 'reg' may be used
  7. uninitialized in this function [-Werror=maybe-uninitialized]
  8. arch/mips/ath79/common.c:62:6: note: 'reg' was declared here
  9. In file included from arch/mips/ath79/common.c:20:0:
  10. arch/mips/ath79/common.c: In function 'ath79_device_reset_clear':
  11. arch/mips/include/asm/mach-ath79/ath79.h:139:20:
  12. error: 'reg' may be used uninitialized in this function
  13. [-Werror=maybe-uninitialized]
  14. arch/mips/ath79/common.c:90:6: note: 'reg' was declared here
  15. Signed-off-by: Markos Chandras <[email protected]>
  16. Acked-by: Gabor Juhos <[email protected]>
  17. ---
  18. arch/mips/ath79/common.c | 4 ++--
  19. 1 file changed, 2 insertions(+), 2 deletions(-)
  20. diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c
  21. index c782b10ddf50..a32a9181a296 100644
  22. --- a/arch/mips/ath79/common.c
  23. +++ b/arch/mips/ath79/common.c
  24. @@ -106,7 +106,7 @@ void ath79_device_reset_set(u32 mask)
  25. else if (soc_is_qca955x())
  26. reg = QCA955X_RESET_REG_RESET_MODULE;
  27. else
  28. - BUG();
  29. + panic("Reset register not defined for this SOC");
  30. spin_lock_irqsave(&ath79_device_reset_lock, flags);
  31. t = ath79_reset_rr(reg);
  32. @@ -134,7 +134,7 @@ void ath79_device_reset_clear(u32 mask)
  33. else if (soc_is_qca955x())
  34. reg = QCA955X_RESET_REG_RESET_MODULE;
  35. else
  36. - BUG();
  37. + panic("Reset register not defined for this SOC");
  38. spin_lock_irqsave(&ath79_device_reset_lock, flags);
  39. t = ath79_reset_rr(reg);
  40. --
  41. 2.11.0