aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/istallion.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-05-07 11:29:25 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-05-07 11:29:25 +1000
commit1ed31d6db90d51010545921e59d369d2f92b7ac2 (patch)
tree358a0b346bc8135cd5e53700eb44308b1a7c8c5b /drivers/char/istallion.c
parentceba1abcb00b0ef0b1efcd715285f6e05523edef (diff)
parent722154e4cacf015161efe60009ae9be23d492296 (diff)
downloadkernel_samsung_crespo-1ed31d6db90d51010545921e59d369d2f92b7ac2.zip
kernel_samsung_crespo-1ed31d6db90d51010545921e59d369d2f92b7ac2.tar.gz
kernel_samsung_crespo-1ed31d6db90d51010545921e59d369d2f92b7ac2.tar.bz2
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/char/istallion.c')
-rw-r--r--drivers/char/istallion.c2
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);
}