diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:30:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:30:30 +0200 |
| commit | cce913178118b0b36742eb7544c2b38a0c957ee7 (patch) | |
| tree | 25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f /drivers/char/riscom8.c | |
| parent | perf: Fix check at end of event search (diff) | |
| parent | perf: Fix exit() vs PERF_FORMAT_GROUP (diff) | |
| download | linux-cce913178118b0b36742eb7544c2b38a0c957ee7.tar.xz linux-cce913178118b0b36742eb7544c2b38a0c957ee7.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Resolve patch dependency
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/riscom8.c')
| -rw-r--r-- | drivers/char/riscom8.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c index 0a8d1e56c993..b02332a5412f 100644 --- a/drivers/char/riscom8.c +++ b/drivers/char/riscom8.c @@ -909,6 +909,7 @@ static int rc_open(struct tty_struct *tty, struct file *filp) if (error) return error; + tty->driver_data = port; return tty_port_open(&port->port, tty, filp); } |