---

yaml --- r: 325643 b: refs/heads/master c: c565ee0 h: refs/heads/master i: 325641: 18d7a87 325639: 3034866 v: v3
git-mirror · Aug 10, 2012 · 7eb93ce · 7eb93ce
1 parent 0e3523a
commit 7eb93ce
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: 5bd420009716f3348610fdf9c6307f0db583ba04
+refs/heads/master: c565ee07708e19474cd1133bf50289a36b5bcc26
diff --git a/trunk/drivers/misc/pti.c b/trunk/drivers/misc/pti.c
@@ -427,7 +427,7 @@ static int pti_tty_driver_open(struct tty_struct *tty, struct file *filp)
 	 * also removes a locking requirement for the actual write
 	 * procedure.
 	 */
-	return tty_port_open(&drv_data->port[tty->index], tty, filp);
+	return tty_port_open(tty->port, tty, filp);
 }
 
 /**
@@ -443,7 +443,7 @@ static int pti_tty_driver_open(struct tty_struct *tty, struct file *filp)
  */
 static void pti_tty_driver_close(struct tty_struct *tty, struct file *filp)
 {
-	tty_port_close(&drv_data->port[tty->index], tty, filp);
+	tty_port_close(tty->port, tty, filp);
 }
 
 /**
@@ -856,7 +856,7 @@ static int __devinit pti_pci_probe(struct pci_dev *pdev,
 		tty_port_init(port);
 		port->ops = &tty_port_ops;
 
-		tty_register_device(pti_tty_driver, a, &pdev->dev);
+		tty_port_register_device(port, pti_tty_driver, a, &pdev->dev);
 	}
 
 	register_console(&pti_console);