Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 59338d4cb68528062f294d95f116357265936076

Authored by Ilpo Jarvinen
Committed by Wim Van Sebroeck
1 parent bb0a38d891
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[WATCHDOG] Add necessary braces to if (...) \n #if... cases 

Signed-off-by: Ilpo Jarvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Showing 2 changed files with 4 additions and 2 deletions Side-by-side Diff

drivers/watchdog/wdt.c
Diff comments   View file @ 59338d4
... ... @@ -253,7 +253,7 @@
253 253 printk(KERN_CRIT "Possible fan fault.\n");
254 254 }
255 255 #endif /* CONFIG_WDT_501 */
256   - if (!(status & WDC_SR_WCCR))
  256 + if (!(status & WDC_SR_WCCR)) {
257 257 #ifdef SOFTWARE_REBOOT
258 258 #ifdef ONLY_TESTING
259 259 printk(KERN_CRIT "Would Reboot.\n");
... ... @@ -264,6 +264,7 @@
264 264 #else
265 265 printk(KERN_CRIT "Reset in 5ms.\n");
266 266 #endif
  267 + }
267 268 return IRQ_HANDLED;
268 269 }
269 270  
drivers/watchdog/wdt_pci.c
Diff comments   View file @ 59338d4
... ... @@ -298,7 +298,7 @@
298 298 printk(KERN_CRIT PFX "Possible fan fault.\n");
299 299 }
300 300 #endif /* CONFIG_WDT_501_PCI */
301   - if (!(status&WDC_SR_WCCR))
  301 + if (!(status&WDC_SR_WCCR)) {
302 302 #ifdef SOFTWARE_REBOOT
303 303 #ifdef ONLY_TESTING
304 304 printk(KERN_CRIT PFX "Would Reboot.\n");
... ... @@ -309,6 +309,7 @@
309 309 #else
310 310 printk(KERN_CRIT PFX "Reset in 5ms.\n");
311 311 #endif
  312 + }
312 313 return IRQ_HANDLED;
313 314 }
314 315