From: Alan Cox Date: Mon, 13 Oct 2008 09:35:33 +0000 (+0100) Subject: nozomi: Fix close on error X-Git-Tag: MMI-PSA29.97-13-9~31770 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=716da631ae91fc5e9f8d5815f8ef5fbfed862b80;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git nozomi: Fix close on error Nozomi assumes the close method isn't called if open errors. The tty layer is different to other drives in this respect however. Pointed out by Denis J Barrow. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c index 66a0f931c66c..9a34a1935283 100644 --- a/drivers/char/nozomi.c +++ b/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);