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

[platform/kernel/linux-rpi.git] / drivers / phy / tegra / xusb.c

diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
index 692c535..9509187 100644 (file)
--- a/drivers/phy/tegra/xusb.c
+++ b/drivers/phy/tegra/xusb.c
@@ -656,6 +656,7 @@ static int tegra_xusb_setup_usb_role_switch(struct tegra_xusb_port *port)
        struct usb_role_switch_desc role_sx_desc = {
                .fwnode = dev_fwnode(&port->dev),
                .set = tegra_xusb_role_sw_set,
+               .allow_userspace_control = true,
        };
        int err = 0;
 
@@ -1270,7 +1271,7 @@ static int tegra_xusb_padctl_remove(struct platform_device *pdev)
 
        padctl->soc->ops->remove(padctl);
 
-       return err;
+       return 0;
 }
 
 static __maybe_unused int tegra_xusb_padctl_suspend_noirq(struct device *dev)