On Fri, Jul 31, 2015 at 10:41:00AM +0800, Li Jun wrote: > Since some chipidea based controller is not otg capable, add ci->is_otg > condition when setting is_otg flag for gadget. > > Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx> > Reviewed-by: Roger Quadros <rogerq@xxxxxx> > Acked-by: Peter Chen <peter.chen@xxxxxxxxxxxxx> > --- > drivers/usb/chipidea/udc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c > index 61fde89..c6d1595 100644 > --- a/drivers/usb/chipidea/udc.c > +++ b/drivers/usb/chipidea/udc.c > @@ -1838,8 +1838,8 @@ static int udc_start(struct ci_hdrc *ci) > ci->gadget.name = ci->platdata->name; > ci->gadget.otg_caps = otg_caps; > > - if (otg_caps->hnp_support || otg_caps->srp_support || > - otg_caps->adp_support) > + if (ci->is_otg && (otg_caps->hnp_support || otg_caps->srp_support || > + otg_caps->adp_support)) > ci->gadget.is_otg = 1; > > INIT_LIST_HEAD(&ci->gadget.ep_list); > -- > 1.9.1 > This is the incremental patch as you request for you apply. Li Jun -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html