projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 4.1-rc4 into tty-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
n_gsm.c
diff --git
a/drivers/tty/n_gsm.c
b/drivers/tty/n_gsm.c
index 7e039669fc82747cb3303f43658dfc396d93b665..c408689a85a94b6ea941c834db76db3195a46079 100644
(file)
--- a/
drivers/tty/n_gsm.c
+++ b/
drivers/tty/n_gsm.c
@@
-3169,7
+3169,7
@@
static int gsmtty_break_ctl(struct tty_struct *tty, int state)
return gsmtty_modem_update(dlci, encode);
}
return gsmtty_modem_update(dlci, encode);
}
-static void gsmtty_
remove(struct tty_driver *driver,
struct tty_struct *tty)
+static void gsmtty_
cleanup(
struct tty_struct *tty)
{
struct gsm_dlci *dlci = tty->driver_data;
struct gsm_mux *gsm = dlci->gsm;
{
struct gsm_dlci *dlci = tty->driver_data;
struct gsm_mux *gsm = dlci->gsm;
@@
-3177,7
+3177,6
@@
static void gsmtty_remove(struct tty_driver *driver, struct tty_struct *tty)
dlci_put(dlci);
dlci_put(gsm->dlci[0]);
mux_put(gsm);
dlci_put(dlci);
dlci_put(gsm->dlci[0]);
mux_put(gsm);
- driver->ttys[tty->index] = NULL;
}
/* Virtual ttys for the demux */
}
/* Virtual ttys for the demux */
@@
-3198,7
+3197,7
@@
static const struct tty_operations gsmtty_ops = {
.tiocmget = gsmtty_tiocmget,
.tiocmset = gsmtty_tiocmset,
.break_ctl = gsmtty_break_ctl,
.tiocmget = gsmtty_tiocmget,
.tiocmset = gsmtty_tiocmset,
.break_ctl = gsmtty_break_ctl,
- .
remove = gsmtty_remove
,
+ .
cleanup = gsmtty_cleanup
,
};
};