diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:57:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:57:04 -0500 |
| commit | 4fe1eaf6f39ed3270aff6068d84a2e6a452da734 (patch) | |
| tree | fded327ed0b11554041c307e3f80272ab082a299 /kernel/printk.c | |
| parent | 8238e747b62db977f80bfd4e5694d4fc2c1112d5 (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
Merge branch 'master'
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index ac8a08f36207..5287be83e3e7 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
| @@ -956,7 +956,7 @@ int unregister_console(struct console *console) | |||
| 956 | if (console_drivers == console) { | 956 | if (console_drivers == console) { |
| 957 | console_drivers=console->next; | 957 | console_drivers=console->next; |
| 958 | res = 0; | 958 | res = 0; |
| 959 | } else { | 959 | } else if (console_drivers) { |
| 960 | for (a=console_drivers->next, b=console_drivers ; | 960 | for (a=console_drivers->next, b=console_drivers ; |
| 961 | a; b=a, a=b->next) { | 961 | a; b=a, a=b->next) { |
| 962 | if (a == console) { | 962 | if (a == console) { |