p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial: mrst_max3110: Check the irq number before enable/disabe irq in PM hooks 

We should check the validity of the irq number before calling
disable_irq() and enable_irq() in the suspend/resume function,
as "max->irq == 0" means the irq is not enabled for max3110
device, otherwise it will hurt device whose irq number is really 0.

Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Feng Tang 2013-10-09 10:39:16 +08:00 committed by Greg Kroah-Hartman
parent 12082ba2cb
commit 09238443c6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tty/serial/mrst_max3110.c
View File

@ -749,7 +749,8 @@ static int serial_m3110_suspend(struct device *dev)
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct uart_max3110 *max = spi_get_drvdata(spi); struct uart_max3110 *max = spi_get_drvdata(spi);
disable_irq(max->irq); if (max->irq > 0)
disable_irq(max->irq);
uart_suspend_port(&serial_m3110_reg, &max->port); uart_suspend_port(&serial_m3110_reg, &max->port);
max3110_out(max, max->cur_conf | WC_SW_SHDI); max3110_out(max, max->cur_conf | WC_SW_SHDI);
return 0; return 0;
@ -762,7 +763,8 @@ static int serial_m3110_resume(struct device *dev)
max3110_out(max, max->cur_conf); max3110_out(max, max->cur_conf);
uart_resume_port(&serial_m3110_reg, &max->port); uart_resume_port(&serial_m3110_reg, &max->port);
enable_irq(max->irq); if (max->irq > 0)
enable_irq(max->irq);
return 0; return 0;
} }