From 3c1988f0a230e11448ba08a02523daaa9c1292d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Date: Fri, 13 Jul 2012 13:33:13 +0200 Subject: [PATCH] --- yaml --- r: 318001 b: refs/heads/master c: 1337b07e664c5a40ae0c5cbc13f5da4cf37c870c h: refs/heads/master i: 317999: 3f5c0fdbdb7703dc0ceeb54b3eaaef2b122b2303 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/devices/ipoctal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38b5427e726a..a9d2175b649e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d254eb7418e389e063831d8d77b7dac240288f02 +refs/heads/master: 1337b07e664c5a40ae0c5cbc13f5da4cf37c870c diff --git a/trunk/drivers/staging/ipack/devices/ipoctal.c b/trunk/drivers/staging/ipack/devices/ipoctal.c index a5af423a4e7c..a1aae40ce68d 100644 --- a/trunk/drivers/staging/ipack/devices/ipoctal.c +++ b/trunk/drivers/staging/ipack/devices/ipoctal.c @@ -114,8 +114,6 @@ static int ipoctal_port_activate(struct tty_port *port, struct tty_struct *tty) ipoctal_write_io_reg(ipoctal, &ipoctal->chan_regs[channel].u.w.cr, CR_ENABLE_RX); - tty->driver_data = ipoctal; - return 0; } @@ -136,6 +134,8 @@ static int ipoctal_open(struct tty_struct *tty, struct file *file) if (atomic_read(&ipoctal->open[channel])) return -EBUSY; + tty->driver_data = ipoctal; + res = tty_port_open(&ipoctal->tty_port[channel], tty, file); if (res) return res;