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

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

Pull USB fixes from Greg KH:
 "Here are 2 small USB driver fixes that resolve some reported
  regressions and one new device quirk. Specifically these are:

   - new quirk for Alcor Link AK9563 smartcard reader

   - revert of u_ether gadget change in 6.2-rc1 that caused problems

   - typec pin probe fix

  All of these have been in linux-next with no reported problems"

* tag 'usb-6.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: core: add quirk for Alcor Link AK9563 smartcard reader
  usb: typec: altmodes/displayport: Fix probe pin assign check
  Revert "usb: gadget: u_ether: Do not make UDC parent of the net device"
parents dd78af9f 303e724d

drivers/usb/core/quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -526,6 +526,9 @@ static const struct usb_device_id usb_quirk_list[] = { 
	/* DJI CineSSD */

	{ USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },



	/* Alcor Link AK9563 SC Reader used in 2022 Lenovo ThinkPads */

	{ USB_DEVICE(0x2ce3, 0x9563), .driver_info = USB_QUIRK_NO_LPM },



	/* DELL USB GEN2 */

	{ USB_DEVICE(0x413c, 0xb062), .driver_info = USB_QUIRK_NO_LPM | USB_QUIRK_RESET_RESUME },

drivers/usb/gadget/function/u_ether.c

+4 −0
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ struct eth_dev *gether_setup_name(struct usb_gadget *g, 
	net->max_mtu = GETHER_MAX_MTU_SIZE;



	dev->gadget = g;

	SET_NETDEV_DEV(net, &g->dev);

	SET_NETDEV_DEVTYPE(net, &gadget_type);



	status = register_netdev(net);
@@ -872,6 +873,8 @@ int gether_register_netdev(struct net_device *net) 
	struct usb_gadget *g;

	int status;



	if (!net->dev.parent)

		return -EINVAL;

	dev = netdev_priv(net);

	g = dev->gadget;
@@ -902,6 +905,7 @@ void gether_set_gadget(struct net_device *net, struct usb_gadget *g) 


	dev = netdev_priv(net);

	dev->gadget = g;

	SET_NETDEV_DEV(net, &g->dev);

}

EXPORT_SYMBOL_GPL(gether_set_gadget);

drivers/usb/typec/altmodes/displayport.c

+4 −4
Original line number Diff line number Diff line
@@ -535,10 +535,10 @@ int dp_altmode_probe(struct typec_altmode *alt) 
	/* FIXME: Port can only be DFP_U. */



	/* Make sure we have compatiple pin configurations */

	if (!(DP_CAP_DFP_D_PIN_ASSIGN(port->vdo) &

	      DP_CAP_UFP_D_PIN_ASSIGN(alt->vdo)) &&

	    !(DP_CAP_UFP_D_PIN_ASSIGN(port->vdo) &

	      DP_CAP_DFP_D_PIN_ASSIGN(alt->vdo)))

	if (!(DP_CAP_PIN_ASSIGN_DFP_D(port->vdo) &

	      DP_CAP_PIN_ASSIGN_UFP_D(alt->vdo)) &&

	    !(DP_CAP_PIN_ASSIGN_UFP_D(port->vdo) &

	      DP_CAP_PIN_ASSIGN_DFP_D(alt->vdo)))

		return -ENODEV;



	ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);