Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325647
b: refs/heads/master
c: 536a344
h: refs/heads/master
i:
  325645: 8844d7f
  325643: 7eb93ce
  325639: 3034866
  325631: 5c660b6
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Aug 10, 2012
1 parent 79cdde2 commit e677d88
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: ee8b593affdf893012e57f4c54a21984d1b0d92e
refs/heads/master: 536a3440a27f8687090bdf33468b003bc0f810cf
8 changes: 4 additions & 4 deletions trunk/drivers/char/ttyprintk.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ static int __init ttyprintk_init(void)
int ret = -ENOMEM;
void *rp;

tty_port_init(&tpk_port.port);
tpk_port.port.ops = &null_ops;
mutex_init(&tpk_port.port_write_mutex);

ttyprintk_driver = alloc_tty_driver(1);
if (!ttyprintk_driver)
return ret;
Expand Down Expand Up @@ -210,10 +214,6 @@ static int __init ttyprintk_init(void)
goto error;
}

tty_port_init(&tpk_port.port);
tpk_port.port.ops = &null_ops;
mutex_init(&tpk_port.port_write_mutex);

return 0;

error:
Expand Down

0 comments on commit e677d88

Please sign in to comment.