diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-10 16:27:20 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-10 16:27:20 +0800 |
| commit | 14839768c2e0f5448f1767729a7fe5791cd4f3dd (patch) | |
| tree | 9f69e695154d828ca8f6e81d76451843f9d543f4 /drivers/tty | |
| parent | 76b225cc90ecdd50e67c4bdb79448973db49ead6 (diff) | |
| parent | f588fca89c529c559ef280a96b4c9143aec904bc (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 2a106a94cdd0..2a1db8c6d231 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2394,11 +2394,11 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) */ tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev); if (likely(!IS_ERR(tty_dev))) { - device_init_wakeup(tty_dev, 1); - device_set_wakeup_enable(tty_dev, 0); - } else + device_set_wakeup_capable(tty_dev, 1); + } else { printk(KERN_ERR "Cannot register tty device on line %d\n", uport->line); + } /* * Ensure UPF_DEAD is not set. |