Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f960dbb authored by Govindraj.R's avatar Govindraj.R Committed by Greg Kroah-Hartman
Browse files

Serial: Avoid unbalanced IRQ wake disable during resume 



To avoid unbalanced IRQ wake disable, ensure that wakeups are disabled
only when wakeups have been successfully enabled.
Tested on OMAP3630SDP/ZOOM3.

Signed-off-by: default avatarGovindraj.R <govindraj.raja@ti.com>
Reported-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6ce5b1ce

drivers/serial/serial_core.c

+6 −2
Original line number Diff line number Diff line
@@ -1986,7 +1986,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) 


	tty_dev = device_find_child(uport->dev, &match, serial_match_port);

	if (device_may_wakeup(tty_dev)) {

		enable_irq_wake(uport->irq);

		if (!enable_irq_wake(uport->irq))

			uport->irq_wake = 1;

		put_device(tty_dev);

		mutex_unlock(&port->mutex);

		return 0;
@@ -2052,7 +2053,10 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) 


	tty_dev = device_find_child(uport->dev, &match, serial_match_port);

	if (!uport->suspended && device_may_wakeup(tty_dev)) {

		if (uport->irq_wake) {

			disable_irq_wake(uport->irq);

			uport->irq_wake = 0;

		}

		mutex_unlock(&port->mutex);

		return 0;

	}

include/linux/serial_core.h

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ struct uart_port { 
	struct device		*dev;			/* parent device */

	unsigned char		hub6;			/* this should be in the 8250 driver */

	unsigned char		suspended;

	unsigned char		irq_wake;

	unsigned char		unused[2];

	void			*private_data;		/* generic platform data pointer */

};