Skip to contentSkip to conversation

TTY/Serial fixes for .36-rc6

PATCH New Greg KH 1 participant 3 messages Sep 20, 2010

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 TTY/Serial fixes for .36-rc6

Here are some serial driver bugfixes for the .36-rc6 kernel.

Minor stuff, but would be good to get included.

Please pull from:

	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/

These patches have been in the linux-next tree and -mm for a while now.

Patches will be sent to the linux-kernel mailing list, if anyone wants to see them.

thanks,

greg k-h

------------

 drivers/serial/amba-pl010.c |    9 ++-------
 drivers/serial/mfd.c        |   17 +++++++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

---------------

Feng Tang (1):
serial: mfd: fix bug in serial_hsu_remove()

Mika Westerberg (1):
serial: amba-pl010: fix set_ldisc

#2 lore raw

PATCH 2/2 serial: mfd: fix bug in serial_hsu_remove()

From: Feng Tang <[email protected]>

Medfield HSU driver deal with 4 pci devices(3 uart ports + 1 dma controller), so in pci remove func, we need handle them differently

---
 drivers/serial/mfd.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
drivers/serial/mfd.c +9 -8
index bc9af50..324c385 100644
@@ -1423,7 +1423,6 @@ static void hsu_global_init(void)
 	}
 
 	phsu = hsu;
-
 	hsu_debugfs_init(hsu);
 	return;
 
@@ -1435,18 +1434,20 @@ err_free_region:
 
 static void serial_hsu_remove(struct pci_dev *pdev)
 {
-	struct hsu_port *hsu;
-	int i;
+	void *priv = pci_get_drvdata(pdev);
+	struct uart_hsu_port *up;
 
-	hsu = pci_get_drvdata(pdev);
-	if (!hsu)
+	if (!priv)
 		return;
 
-	for (i = 0; i < 3; i++)
-		uart_remove_one_port(&serial_hsu_reg, &hsu->port[i].port);
+	/* For port 0/1/2, priv is the address of uart_hsu_port */
+	if (pdev->device != 0x081E) {
+		up = priv;
+		uart_remove_one_port(&serial_hsu_reg, &up->port);
+	}
 
 	pci_set_drvdata(pdev, NULL);
-	free_irq(hsu->irq, hsu);
+	free_irq(pdev->irq, priv);
 	pci_disable_device(pdev);
 }
 
Signature · 1 line
1.7.2
#1 lore raw

PATCH 1/2 serial: amba-pl010: fix set_ldisc

In reply to Greg KH

From: Mika Westerberg <[email protected]>

Commit d87d9b7d1 ("tty: serial - fix tty referencing in set_ldisc") changed set_ldisc to take ldisc number as parameter. This patch fixes AMBA PL010 driver according the new prototype.

---
 drivers/serial/amba-pl010.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
drivers/serial/amba-pl010.c +2 -7
index 50441ff..2904aa0 100644
@@ -472,14 +472,9 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
 	spin_unlock_irqrestore(&uap->port.lock, flags);
 }
 
-static void pl010_set_ldisc(struct uart_port *port)
+static void pl010_set_ldisc(struct uart_port *port, int new)
 {
-	int line = port->line;
-
-	if (line >= port->state->port.tty->driver->num)
-		return;
-
-	if (port->state->port.tty->ldisc->ops->num == N_PPS) {
+	if (new == N_PPS) {
 		port->flags |= UPF_HARDPPS_CD;
 		pl010_enable_ms(port);
 	} else
Signature · 1 line
1.7.2