diff options
author | Jiri Kosina <jkosina@suse.com> | 2024-03-13 23:17:33 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.com> | 2024-03-13 23:17:33 +0300 |
commit | 2e21dee6a46a66e4c2ced778485e1044101edee4 (patch) | |
tree | b9a9565cf9e3954ad316c343715b43b401c51074 /drivers/usb/phy/phy-mxs-usb.c | |
parent | 9a5b1521e2d0d7ace70c6e5eed073babcec91409 (diff) | |
parent | 90184f90c9ac559062a04aca72e5d05730164de0 (diff) | |
download | linux-2e21dee6a46a66e4c2ced778485e1044101edee4.tar.xz |
Merge branch 'for-6.9/amd-sfh' into for-linus
- assorted fixes and optimizations for amd-sfh (Basavaraj Natikar)
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'drivers/usb/phy/phy-mxs-usb.c')
-rw-r--r-- | drivers/usb/phy/phy-mxs-usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c index acd46b72899e..920a32cd094d 100644 --- a/drivers/usb/phy/phy-mxs-usb.c +++ b/drivers/usb/phy/phy-mxs-usb.c @@ -388,8 +388,7 @@ static void __mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool disconnect) static bool mxs_phy_is_otg_host(struct mxs_phy *mxs_phy) { - return IS_ENABLED(CONFIG_USB_OTG) && - mxs_phy->phy.last_event == USB_EVENT_ID; + return mxs_phy->phy.last_event == USB_EVENT_ID; } static void mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool on) |