Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227056
b: refs/heads/master
c: 597c606
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Nov 16, 2010
1 parent 898a829 commit b84d7a8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23308ba54dcdb54481163bfb07dd8aeca76a7a2e
refs/heads/master: 597c606f560cf7ef6029152fa7574bddbfb0252f
8 changes: 4 additions & 4 deletions trunk/arch/parisc/kernel/pdc_cons.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ static int pdc_console_setup(struct console *co, char *options)

static struct timer_list pdc_console_timer;

extern struct console * console_drivers;

static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp)
{

Expand Down Expand Up @@ -169,11 +167,13 @@ static int __init pdc_console_tty_driver_init(void)
* It is unregistered if the pdc console was not selected as the
* primary console. */

struct console *tmp = console_drivers;
struct console *tmp;

for (tmp = console_drivers; tmp; tmp = tmp->next)
acquire_console_sem();
for_each_console(tmp)
if (tmp == &pdc_cons)
break;
release_console_sem();

if (!tmp) {
printk(KERN_INFO "PDC console driver not registered anymore, not creating %s\n", pdc_cons.name);
Expand Down

0 comments on commit b84d7a8

Please sign in to comment.