aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/tty/serial/omap-serial.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 837f6c1c8e7a..f456f461dd02 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1694,8 +1694,10 @@ static int serial_omap_probe(struct platform_device *pdev)
1694 omap_up_info->DTR_present) { 1694 omap_up_info->DTR_present) {
1695 up->DTR_gpio = omap_up_info->DTR_gpio; 1695 up->DTR_gpio = omap_up_info->DTR_gpio;
1696 up->DTR_inverted = omap_up_info->DTR_inverted; 1696 up->DTR_inverted = omap_up_info->DTR_inverted;
1697 } else 1697 } else {
1698 up->DTR_gpio = -EINVAL; 1698 up->DTR_gpio = -EINVAL;
1699 }
1700
1699 up->DTR_active = 0; 1701 up->DTR_active = 0;
1700 1702
1701 up->dev = &pdev->dev; 1703 up->dev = &pdev->dev;
@@ -1757,6 +1759,7 @@ static int serial_omap_probe(struct platform_device *pdev)
1757 platform_set_drvdata(pdev, up); 1759 platform_set_drvdata(pdev, up);
1758 if (omap_up_info->autosuspend_timeout == 0) 1760 if (omap_up_info->autosuspend_timeout == 0)
1759 omap_up_info->autosuspend_timeout = -1; 1761 omap_up_info->autosuspend_timeout = -1;
1762
1760 device_init_wakeup(up->dev, true); 1763 device_init_wakeup(up->dev, true);
1761 pm_runtime_use_autosuspend(&pdev->dev); 1764 pm_runtime_use_autosuspend(&pdev->dev);
1762 pm_runtime_set_autosuspend_delay(&pdev->dev, 1765 pm_runtime_set_autosuspend_delay(&pdev->dev,