summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/omap-serial.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-04-23 09:58:29 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-24 16:16:33 -0700
commit5b6acc79252e65a2bc3181a55d45c8e7b6f7876c (patch)
tree884b98f9d36d51fe7dbfd88ca4b975f0ec206a81 /drivers/tty/serial/omap-serial.c
parentbd5dc09f557547399cd44d0a1224df7ff64e4a6b (diff)
downloadop-kernel-dev-5b6acc79252e65a2bc3181a55d45c8e7b6f7876c.zip
op-kernel-dev-5b6acc79252e65a2bc3181a55d45c8e7b6f7876c.tar.gz
tty: serial: add missing braces
per CodingStyle we should have those braces, no functional changes. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
-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 837f6c1..f456f46 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)
omap_up_info->DTR_present) {
up->DTR_gpio = omap_up_info->DTR_gpio;
up->DTR_inverted = omap_up_info->DTR_inverted;
- } else
+ } else {
up->DTR_gpio = -EINVAL;
+ }
+
up->DTR_active = 0;
up->dev = &pdev->dev;
@@ -1757,6 +1759,7 @@ static int serial_omap_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, up);
if (omap_up_info->autosuspend_timeout == 0)
omap_up_info->autosuspend_timeout = -1;
+
device_init_wakeup(up->dev, true);
pm_runtime_use_autosuspend(&pdev->dev);
pm_runtime_set_autosuspend_delay(&pdev->dev,
OpenPOWER on IntegriCloud