Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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"
+11
-4
+3
drivers/usb/core/quirks.c
+3
drivers/usb/core/quirks.c
···
526
526
/* DJI CineSSD */
527
527
{ USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },
528
528
529
+
/* Alcor Link AK9563 SC Reader used in 2022 Lenovo ThinkPads */
530
+
{ USB_DEVICE(0x2ce3, 0x9563), .driver_info = USB_QUIRK_NO_LPM },
531
+
529
532
/* DELL USB GEN2 */
530
533
{ USB_DEVICE(0x413c, 0xb062), .driver_info = USB_QUIRK_NO_LPM | USB_QUIRK_RESET_RESUME },
531
534
+4
drivers/usb/gadget/function/u_ether.c
+4
drivers/usb/gadget/function/u_ether.c
···
798
798
net->max_mtu = GETHER_MAX_MTU_SIZE;
799
799
800
800
dev->gadget = g;
801
+
SET_NETDEV_DEV(net, &g->dev);
801
802
SET_NETDEV_DEVTYPE(net, &gadget_type);
802
803
803
804
status = register_netdev(net);
···
873
872
struct usb_gadget *g;
874
873
int status;
875
874
875
+
if (!net->dev.parent)
876
+
return -EINVAL;
876
877
dev = netdev_priv(net);
877
878
g = dev->gadget;
878
879
···
905
902
906
903
dev = netdev_priv(net);
907
904
dev->gadget = g;
905
+
SET_NETDEV_DEV(net, &g->dev);
908
906
}
909
907
EXPORT_SYMBOL_GPL(gether_set_gadget);
910
908
+4
-4
drivers/usb/typec/altmodes/displayport.c
+4
-4
drivers/usb/typec/altmodes/displayport.c
···
535
535
/* FIXME: Port can only be DFP_U. */
536
536
537
537
/* Make sure we have compatiple pin configurations */
538
-
if (!(DP_CAP_DFP_D_PIN_ASSIGN(port->vdo) &
539
-
DP_CAP_UFP_D_PIN_ASSIGN(alt->vdo)) &&
540
-
!(DP_CAP_UFP_D_PIN_ASSIGN(port->vdo) &
541
-
DP_CAP_DFP_D_PIN_ASSIGN(alt->vdo)))
538
+
if (!(DP_CAP_PIN_ASSIGN_DFP_D(port->vdo) &
539
+
DP_CAP_PIN_ASSIGN_UFP_D(alt->vdo)) &&
540
+
!(DP_CAP_PIN_ASSIGN_UFP_D(port->vdo) &
541
+
DP_CAP_PIN_ASSIGN_DFP_D(alt->vdo)))
542
542
return -ENODEV;
543
543
544
544
ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);