diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /init | |
| parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
| parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 4a2f0898dda1..f715b9b89753 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -582,7 +582,7 @@ static void __init do_initcalls(void) | |||
| 582 | 582 | ||
| 583 | result = (*call)(); | 583 | result = (*call)(); |
| 584 | 584 | ||
| 585 | if (result && (result != -ENODEV || initcall_debug)) { | 585 | if (result && result != -ENODEV && initcall_debug) { |
| 586 | sprintf(msgbuf, "error code %d", result); | 586 | sprintf(msgbuf, "error code %d", result); |
| 587 | msg = msgbuf; | 587 | msg = msgbuf; |
| 588 | } | 588 | } |