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

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

Merge tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are some USB fixes for 3.18-rc4.

  Just a bunch of little fixes resolving reported issues and new device
  ids for existing drivers.  Full details are in the shortlog"

* tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
  USB: Update default usb-storage delay_use value in kernel-parameters.txt
  USB: cdc-acm: add quirk for control-line state requests
  phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
  USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init()
  USB: cdc-acm: only raise DTR on transitions from B0
  Revert "storage: Replace magic number with define in usb_stor_euscsi_init()"
  usb: core: notify disconnection when core detects disconnect
  usb: core: need to call usb_phy_notify_connect after device setup
  uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models
  xhci: no switching back on non-ULT Haswell
  USB: quirks: enable device-qualifier quirk for yet another Elan touchscreen
  USB: quirks: enable device-qualifier quirk for another Elan touchscreen
  MAINTAINERS: Remove duplicate entry for usbip driver
  usb: storage: fix build warnings !CONFIG_PM
  usb: Remove references to non-existent PLAT_S5P symbol
  uas: Add NO_ATA_1X for VIA VL711 devices
  xhci: Disable streams on Asmedia 1042 xhci controllers
  USB: HWA: fix a warning message
  uas: Add US_FL_NO_ATA_1X quirk for 1 more Seagate model
  usb-storage: handle a skipped data phase
  ...
parents fe606dff 19101954

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -3621,7 +3621,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	usb-storage.delay_use=

			[UMS] The delay in seconds before a new device is

			scanned for Logical Units (default 5).

			scanned for Logical Units (default 1).



	usb-storage.quirks=

			[UMS] A list of quirks entries to supplement or

MAINTAINERS

+0 −5
Original line number Diff line number Diff line
@@ -9703,11 +9703,6 @@ S: Maintained 
F:	Documentation/hid/hiddev.txt

F:	drivers/hid/usbhid/



USB/IP DRIVERS

L:	linux-usb@vger.kernel.org

S:	Orphan

F:	drivers/staging/usbip/



USB ISP116X DRIVER

M:	Olav Kongas <ok@artecdesign.ee>

L:	linux-usb@vger.kernel.org

drivers/phy/phy-omap-usb2.c

+4 −2
Original line number Diff line number Diff line
@@ -258,14 +258,16 @@ static int omap_usb2_probe(struct platform_device *pdev) 
	otg->phy		= &phy->phy;



	platform_set_drvdata(pdev, phy);

	pm_runtime_enable(phy->dev);



	generic_phy = devm_phy_create(phy->dev, NULL, &ops, NULL);

	if (IS_ERR(generic_phy))

	if (IS_ERR(generic_phy)) {

		pm_runtime_disable(phy->dev);

		return PTR_ERR(generic_phy);

	}



	phy_set_drvdata(generic_phy, phy);



	pm_runtime_enable(phy->dev);

	phy_provider = devm_of_phy_provider_register(phy->dev,

			of_phy_simple_xlate);

	if (IS_ERR(phy_provider)) {

drivers/usb/class/cdc-acm.c

+21 −4
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ static struct acm *acm_table[ACM_TTY_MINORS]; 


static DEFINE_MUTEX(acm_table_lock);



static void acm_tty_set_termios(struct tty_struct *tty,

				struct ktermios *termios_old);



/*

 * acm_table accessors

 */
@@ -145,8 +148,15 @@ static int acm_ctrl_msg(struct acm *acm, int request, int value, 
/* devices aren't required to support these requests.

 * the cdc acm descriptor tells whether they do...

 */

#define acm_set_control(acm, control) \

	acm_ctrl_msg(acm, USB_CDC_REQ_SET_CONTROL_LINE_STATE, control, NULL, 0)

static inline int acm_set_control(struct acm *acm, int control)

{

	if (acm->quirks & QUIRK_CONTROL_LINE_STATE)

		return -EOPNOTSUPP;



	return acm_ctrl_msg(acm, USB_CDC_REQ_SET_CONTROL_LINE_STATE,

			control, NULL, 0);

}



#define acm_set_line(acm, line) \

	acm_ctrl_msg(acm, USB_CDC_REQ_SET_LINE_CODING, 0, line, sizeof *(line))

#define acm_send_break(acm, ms) \
@@ -554,6 +564,8 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty) 
		goto error_submit_urb;

	}



	acm_tty_set_termios(tty, NULL);



	/*

	 * Unthrottle device in case the TTY was closed while throttled.

	 */
@@ -980,11 +992,12 @@ static void acm_tty_set_termios(struct tty_struct *tty, 
	/* FIXME: Needs to clear unsupported bits in the termios */

	acm->clocal = ((termios->c_cflag & CLOCAL) != 0);



	if (!newline.dwDTERate) {

	if (C_BAUD(tty) == B0) {

		newline.dwDTERate = acm->line.dwDTERate;

		newctrl &= ~ACM_CTRL_DTR;

	} else

	} else if (termios_old && (termios_old->c_cflag & CBAUD) == B0) {

		newctrl |=  ACM_CTRL_DTR;

	}



	if (newctrl != acm->ctrlout)

		acm_set_control(acm, acm->ctrlout = newctrl);
@@ -1314,6 +1327,7 @@ static int acm_probe(struct usb_interface *intf, 
	tty_port_init(&acm->port);

	acm->port.ops = &acm_port_ops;

	init_usb_anchor(&acm->delayed);

	acm->quirks = quirks;



	buf = usb_alloc_coherent(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);

	if (!buf) {
@@ -1681,6 +1695,9 @@ static const struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x20df, 0x0001), /* Simtec Electronics Entropy Key */

	.driver_info = QUIRK_CONTROL_LINE_STATE, },

	{ USB_DEVICE(0x2184, 0x001c) },	/* GW Instek AFG-2225 */

	{ USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */

	},

	/* Motorola H24 HSPA module: */

drivers/usb/class/cdc-acm.h

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct acm { 
	unsigned int throttle_req:1;			/* throttle requested */

	u8 bInterval;

	struct usb_anchor delayed;			/* writes queued for a device about to be woken */

	unsigned long quirks;

};



#define CDC_DATA_INTERFACE_TYPE	0x0a
@@ -132,3 +133,4 @@ struct acm { 
#define NOT_A_MODEM			BIT(3)

#define NO_DATA_INTERFACE		BIT(4)

#define IGNORE_DEVICE			BIT(5)

#define QUIRK_CONTROL_LINE_STATE	BIT(6)