Merge "tty: hvc_console, fix crashes on parallel open/close" (e5734f37) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/tty/hvc/hvc_console.c

+8 −15

Original line number	Diff line number	Diff line
		@@ -375,15 +375,14 @@ static int hvc_open(struct tty_struct tty, struct file filp)
		* tty fields and return the kref reference.
		*/
		if (rc) {
		tty_port_tty_set(&hp->port, NULL);
		tty->driver_data = NULL;
		tty_port_put(&hp->port);
		printk(KERN_ERR "hvc_open: request_irq failed with rc %d.\n", rc);
		} else
		} else {
		/* We are ready... raise DTR/RTS */
		if (C_BAUD(tty))
		if (hp->ops->dtr_rts)
		hp->ops->dtr_rts(hp, 1);
		tty_port_set_initialized(&hp->port, true);
		}

		/* Force wakeup of the polling thread */
		hvc_kick();
		@@ -393,22 +392,12 @@ static int hvc_open(struct tty_struct tty, struct file filp)

		static void hvc_close(struct tty_struct tty, struct file filp)
		{
		struct hvc_struct *hp;
		struct hvc_struct *hp = tty->driver_data;
		unsigned long flags;

		if (tty_hung_up_p(filp))
		return;

		/*
		* No driver_data means that this close was issued after a failed
		* hvc_open by the tty layer's release_dev() function and we can just
		* exit cleanly because the kref reference wasn't made.
		*/
		if (!tty->driver_data)
		return;

		hp = tty->driver_data;

		spin_lock_irqsave(&hp->port.lock, flags);

		if (--hp->port.count == 0) {
		@@ -416,6 +405,9 @@ static void hvc_close(struct tty_struct tty, struct file filp)
		/* We are done with the tty pointer now. */
		tty_port_tty_set(&hp->port, NULL);

		if (!tty_port_initialized(&hp->port))
		return;

		if (C_HUPCL(tty))
		if (hp->ops->dtr_rts)
		hp->ops->dtr_rts(hp, 0);
		@@ -432,6 +424,7 @@ static void hvc_close(struct tty_struct tty, struct file filp)
		* waking periodically to check chars_in_buffer().
		*/
		tty_wait_until_sent(tty, HVC_CLOSE_WAIT);
		tty_port_set_initialized(&hp->port, false);
		} else {
		if (hp->port.count < 0)
		printk(KERN_ERR "hvc_close %X: oops, count is %d\n",