summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-03-19 22:35:13 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-19 19:10:25 -0700
commit74081f8667d73ad59961cf63be5f0e9d6a87c8a3 (patch)
treef809a9e099c252c89ea18c84bf991f7af76e8b7e
parent57eee3d23e8833ca18708b374c648235691942ba (diff)
downloadlinux-74081f8667d73ad59961cf63be5f0e9d6a87c8a3.tar.gz
linux-74081f8667d73ad59961cf63be5f0e9d6a87c8a3.tar.bz2
linux-74081f8667d73ad59961cf63be5f0e9d6a87c8a3.zip
PM: Fix misuse of wakeup flag accessors in serial core
This patch (as1059) fixes a mistake in the way the serial core initializes a device's wakeup settings. It should use the accessor routine instead of relying on a macro producing an lvalue. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/serial/serial_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index c32c1ca75f63..a9ca03ead3e5 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2422,7 +2422,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
*/
tty_dev = tty_register_device(drv->tty_driver, port->line, port->dev);
if (likely(!IS_ERR(tty_dev))) {
- device_can_wakeup(tty_dev) = 1;
+ device_init_wakeup(tty_dev, 1);
device_set_wakeup_enable(tty_dev, 0);
} else
printk(KERN_ERR "Cannot register tty device on line %d\n",