diff options
| author | Stephan Gerhold <stephan@gerhold.net> | 2022-05-28 19:09:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-22 14:28:07 +0200 |
| commit | 1b3cf8f2090c5b657fca90d05341fc4faed1eb5e (patch) | |
| tree | 80335aaf6deaf947a070ec9bf87520b49edb477d /net/lapb/lapb_in.c | |
| parent | 5e6d1d0866fe4be84e5e948fb8511384a7026ca2 (diff) | |
usb: dwc3: pci: Restore line lost in merge conflict resolution
commit 7ddda2614d62ef7fdef7fd85f5151cdf665b22d8 upstream.
Commit 582ab24e096f ("usb: dwc3: pci: Set "linux,phy_charger_detect"
property on some Bay Trail boards") added a new swnode similar to the
existing ones for boards where the PHY handles charger detection.
Unfortunately, the "linux,sysdev_is_parent" property got lost in the
merge conflict resolution of commit ca9400ef7f67 ("Merge 5.17-rc6 into
usb-next"). Now dwc3_pci_intel_phy_charger_detect_properties is the
only swnode in dwc3-pci that is missing "linux,sysdev_is_parent".
It does not seem to cause any obvious functional issues, but it's
certainly unintended so restore the line to make the properties
consistent again.
Fixes: ca9400ef7f67 ("Merge 5.17-rc6 into usb-next")
Cc: stable@vger.kernel.org
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20220528170913.9240-1-stephan@gerhold.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions