---

yaml --- r: 287059 b: refs/heads/master c: 7735983 h: refs/heads/master i: 287057: 5ddf27a 287055: 260929a v: v3
git-mirror · Jan 25, 2012 · ff9bcf7 · ff9bcf7
1 parent 97b9a99
commit ff9bcf7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5492e6591b8fdf171236046f9d6194f9bb4062b
+refs/heads/master: 773598357c0baf03081cf87f2b444f97744faf1e
diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c
@@ -2348,11 +2348,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.