Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7986824e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial 

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] ip22zilog: Fix oops on runlevel change with serial console
  [SERIAL] Fix two bugs in parport_serial
parents d423421c c4432c41

drivers/parport/parport_serial.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -312,8 +312,7 @@ static int __devinit parport_register (struct pci_dev *dev, 
{

{

	struct parport_pc_pci *card;

	struct parport_pc_pci *card;

	struct parport_serial_private *priv = pci_get_drvdata (dev);

	struct parport_serial_private *priv = pci_get_drvdata (dev);

	int i = id->driver_data, n;

	int n, success = 0;

	int success = 0;





	priv->par = cards[id->driver_data];

	priv->par = cards[id->driver_data];

	card = &priv->par;

	card = &priv->par;
@@ -344,10 +343,8 @@ static int __devinit parport_register (struct pci_dev *dev, 
                                        "hi" as an offset (see SYBA

                                        "hi" as an offset (see SYBA

                                        def.) */

                                        def.) */

		/* TODO: test if sharing interrupts works */

		/* TODO: test if sharing interrupts works */

		printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, "

		dev_dbg(&dev->dev, "PCI parallel port detected: I/O at "

			"I/O at %#lx(%#lx)\n",

			"%#lx(%#lx)\n", io_lo, io_hi);

			parport_serial_pci_tbl[i].vendor,

			parport_serial_pci_tbl[i].device, io_lo, io_hi);

		port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE,

		port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE,

					      PARPORT_DMA_NONE, dev);

					      PARPORT_DMA_NONE, dev);

		if (port) {

		if (port) {
@@ -359,7 +356,7 @@ static int __devinit parport_register (struct pci_dev *dev, 
	if (card->postinit_hook)

	if (card->postinit_hook)

		card->postinit_hook (dev, card, !success);

		card->postinit_hook (dev, card, !success);





	return success ? 0 : 1;

	return 0;

}

}





static int __devinit parport_serial_pci_probe (struct pci_dev *dev,

static int __devinit parport_serial_pci_probe (struct pci_dev *dev,

drivers/serial/ip22zilog.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -420,10 +420,8 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up, 
	if (up->port.info == NULL)

	if (up->port.info == NULL)

		goto ack_tx_int;

		goto ack_tx_int;

	xmit = &up->port.info->xmit;

	xmit = &up->port.info->xmit;

	if (uart_circ_empty(xmit)) {

	if (uart_circ_empty(xmit))

		uart_write_wakeup(&up->port);

		goto ack_tx_int;

		goto ack_tx_int;

	}

	if (uart_tx_stopped(&up->port))

	if (uart_tx_stopped(&up->port))

		goto ack_tx_int;

		goto ack_tx_int;