diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 15:44:08 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 15:44:08 +0300 |
| commit | c4a07e264d38d5cad5d77298957cbd7d7db70b1f (patch) | |
| tree | bf7d4da0dadc50248951c643ca4f3f16a6ef8d04 /drivers/usb/typec/altmodes | |
| parent | f87b564686ee47c480ccacc3922b38a8c54a6945 (diff) | |
| parent | ceaa837f96adb69c0df0397937cd74991d5d821a (diff) | |
| download | linux-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.tar.xz | |
Merge 6.2-rc8 into usb-next
We need the USB fixes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/altmodes')
| -rw-r--r-- | drivers/usb/typec/altmodes/displayport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c index 20db51471c98..662cd043b50e 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -547,10 +547,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); |