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

Commit a60387ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (40 commits)
  USB: open disconnect race in usblcd
  USB: disconnect open race in legousbtower
  USB: open disconnect race in iowarrior
  USB: missing error check in emi62
  USB: missing error check in emi26
  USB: usb_serial_resume bug fix
  USB: remove new OHCI build warnings
  USB: amd5536udc - remove set_mwi() compiler warning
  USB: usbserial - fix potential deadlock between write() and IRQ
  usb: serial/pl2303: support for IO Data Device RSAQ5
  USB: fix read vs. disconnect race in cytherm driver
  USB: fix locking in idmouse
  USB: fix interface sysfs file-creation bug
  USB: fix ssb_ohci_probe() build bug
  USB: pl2303: remove can't happen checks, set speed properly and report baud rate
  USB: mos7840: Clean up old checks and stuff
  USB rio500.c: fix check-after-use
  USB iowarrior.c: fix check-after-use
  USB: add URB_FREE_BUFFER to permissible flags
  USB: isd200: sort out USB/IDE dependancy mess
  ...
parents 0e81bef0 d5d1ceac

drivers/serial/serial_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1875,6 +1875,7 @@ uart_set_options(struct uart_port *port, struct console *co, 
		 int baud, int parity, int bits, int flow)

{

	struct ktermios termios;

	static struct ktermios dummy;

	int i;



	/*
@@ -1920,7 +1921,7 @@ uart_set_options(struct uart_port *port, struct console *co, 
	 */

	port->mctrl |= TIOCM_DTR;



	port->ops->set_termios(port, &termios, NULL);

	port->ops->set_termios(port, &termios, &dummy);

	co->cflag = termios.c_cflag;



	return 0;

drivers/usb/core/message.c

+7 −1
Original line number Diff line number Diff line
@@ -1641,6 +1641,12 @@ free_interfaces: 
				intf->dev.bus_id, ret);

			continue;

		}



		/* The driver's probe method can call usb_set_interface(),

		 * which would mean the interface's sysfs files are already

		 * created.  Just in case, we'll remove them first.

		 */

		usb_remove_sysfs_intf_files(intf);

		usb_create_sysfs_intf_files(intf);

	}

drivers/usb/core/urb.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) 


	/* enforce simple/standard policy */

	allowed = (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP |

			URB_NO_INTERRUPT | URB_DIR_MASK);

			URB_NO_INTERRUPT | URB_DIR_MASK | URB_FREE_BUFFER);

	switch (xfertype) {

	case USB_ENDPOINT_XFER_BULK:

		if (is_out)

drivers/usb/gadget/amd5536udc.c

+1 −1
Original line number Diff line number Diff line
@@ -3289,7 +3289,7 @@ static int udc_pci_probe( 
	dev->chiprev = pdev->revision;



	pci_set_master(pdev);

	pci_set_mwi(pdev);

	pci_try_set_mwi(pdev);



	/* init dma pools */

	if (use_dma) {

drivers/usb/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ config USB_OHCI_HCD_PCI 


config USB_OHCI_HCD_SSB

	bool "OHCI support for Broadcom SSB OHCI core"

	depends on USB_OHCI_HCD && SSB && EXPERIMENTAL

	depends on USB_OHCI_HCD && (SSB = y || SSB = CONFIG_USB_OHCI_HCD) && EXPERIMENTAL

	default n

	---help---

	  Support for the Sonics Silicon Backplane (SSB) attached