From 51827093093a39a58ff2038a53c1d57ddce37d8e Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 13 Oct 2008 10:35:33 +0100 Subject: [PATCH] --- yaml --- r: 113426 b: refs/heads/master c: 716da631ae91fc5e9f8d5815f8ef5fbfed862b80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/nozomi.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 88d891b11778..26d8096c8fbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c8946d97ae7d2d6691f8290a10faa63453b63f8 +refs/heads/master: 716da631ae91fc5e9f8d5815f8ef5fbfed862b80 diff --git a/trunk/drivers/char/nozomi.c b/trunk/drivers/char/nozomi.c index 66a0f931c66c..9a34a1935283 100644 --- a/trunk/drivers/char/nozomi.c +++ b/trunk/drivers/char/nozomi.c @@ -1599,7 +1599,10 @@ static int ntty_open(struct tty_struct *tty, struct file *file) return 0; } -/* Called when the userspace process close the tty, /dev/noz*. */ +/* Called when the userspace process close the tty, /dev/noz*. Also + called immediately if ntty_open fails in which case tty->driver_data + will be NULL an we exit by the first return */ + static void ntty_close(struct tty_struct *tty, struct file *file) { struct nozomi *dc = get_dc_by_tty(tty);