On Mon, Sep 26, 2022 at 11:31:58AM -0700, Andrey Smirnov wrote: > On Mon, Sep 26, 2022 at 3:19 AM Andy Shevchenko > <andriy.shevchenko@xxxxxxxxx> wrote: > > On Sun, Sep 25, 2022 at 10:43:07PM -0700, Andrey Smirnov wrote: > > > On Sun, Sep 25, 2022 at 12:21 PM Ferry Toth <fntoth@xxxxxxxxx> wrote: ... > > > IMHO instead of trying to rush something in it be prudent to revert my > > > patch _and_ address the fact that above patch was lost during the > > > merge (Andy's revert needs to be updated) > > > > I'm not an expert in your fixes for DWC3, so please come up with > > the solution sooner than later, otherwise I will try to get my > > reverts into the final release, because they obviously fix the > > regression. > > You don't need to be an expert here. All that's required is that your > revert get the code to look like it looks in > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.0-rc6&id=ab7aa2866d295438dc60522f85c5421c6b4f1507 > > so the last hunk in your patch instead of looking like: > > @@ -538,6 +584,10 @@ int dwc3_drd_init(struct dwc3 *dwc) > { > int ret, irq; > > + dwc->edev = dwc3_get_extcon(dwc); > + if (IS_ERR(dwc->edev)) > + return PTR_ERR(dwc->edev); > + > if (ROLE_SWITCH && > device_property_read_bool(dwc->dev, "usb-role-switch")) > return dwc3_setup_role_switch(dwc); > > should look like > > @@ -538,6 +584,10 @@ int dwc3_drd_init(struct dwc3 *dwc) > { > int ret, irq; > > if (ROLE_SWITCH && > device_property_read_bool(dwc->dev, "usb-role-switch")) > return dwc3_setup_role_switch(dwc); > > + dwc->edev = dwc3_get_extcon(dwc); > + if (IS_ERR(dwc->edev)) > + return PTR_ERR(dwc->edev); > + > > Can you update your series accordingly or do you need me to do that? I > won't have the cycles until the end of the week (Sat). Thanks for elaboration. I will do it (hopefully today). -- With Best Regards, Andy Shevchenko
