diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:58 +0200 |
| commit | 9ebb0554cd0e19f3757f4f5eea723eaf3b6dab78 (patch) | |
| tree | 1398d0d22c2e2e4f8724894602ec4a093f45ac53 /lib | |
| parent | a4b1ee0def6e8e727886cbfed08c7004c84bf78f (diff) | |
| parent | 6dd233f435a73af2875484a88684252689e900d9 (diff) | |
| download | barebox-9ebb0554cd0e19f3757f4f5eea723eaf3b6dab78.tar.gz barebox-9ebb0554cd0e19f3757f4f5eea723eaf3b6dab78.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vsprintf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index d93134053a..c73db73e88 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -630,11 +630,11 @@ void __noreturn panic(const char *fmt, ...) led_trigger(LED_TRIGGER_PANIC, TRIGGER_ENABLE); -#if defined (CONFIG_PANIC_HANG) - hang(); -#else - udelay(100000); /* allow messages to go out */ - reset_cpu(0); -#endif + if (IS_ENABLED(CONFIG_PANIC_HANG)) { + hang(); + } else { + udelay(100000); /* allow messages to go out */ + reset_cpu(0); + } } EXPORT_SYMBOL(panic); |