summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-08-24 21:41:08 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-08-24 21:41:08 +0200
commit5a50a01bf00c8191073fdf518e1af1e950ac3af5 (patch)
treececd3d3f8d5ea4c3fe641b09870ead8adc7ef797 /drivers/tty
parentb7ab83edba2d50583bc9520431618489379718b2 (diff)
sh-sci / PM: Use power.irq_safe
Since sci_port_enable() and sci_port_disable() may be run with interrupts off and they execute pm_runtime_get_sync() and pm_runtime_put_sync(), respectively, the SCI device's power.irq_safe flag has to be set to indicate that it is safe to execute runtime PM callbacks for this device with interrupts off. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Magnus Damm <damm@opensource.se>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sh-sci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 2ec57b2fb27..a9414facda4 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1913,6 +1913,7 @@ static int __devinit sci_init_single(struct platform_device *dev,
port->dev = &dev->dev;
+ pm_runtime_irq_safe(&dev->dev);
pm_runtime_enable(&dev->dev);
}