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/istallion.c | |
parent | d9f599e1e6d019968b35d2dc63074b9e8964fa69 (diff) | |
parent | 4fd38e4595e2f6c9d27732c042a0e16b2753049c (diff) | |
download | op-kernel-dev-cce913178118b0b36742eb7544c2b38a0c957ee7.zip op-kernel-dev-cce913178118b0b36742eb7544c2b38a0c957ee7.tar.gz |
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/istallion.c')
-rw-r--r-- | drivers/char/istallion.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 4cd6c52..4e395c9 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c @@ -827,6 +827,8 @@ static int stli_open(struct tty_struct *tty, struct file *filp) return -ENODEV; if (portp->devnr < 1) return -ENODEV; + + tty->driver_data = portp; return tty_port_open(&portp->port, tty, filp); } |