From: Robert Baldyga Date: Thu, 19 Sep 2013 09:50:21 +0000 (+0200) Subject: usb: gadget: s3c-hsotg: fix "halted" property updating X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a18ed7b036454794dc2d18b92e531c76953d556f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git usb: gadget: s3c-hsotg: fix "halted" property updating Property "halted" of s3c_hsotg_ep structure is actually initialised when ep enabled, and changed when halt is set/cleared. Signed-off-by: Robert Baldyga Signed-off-by: Kyungmin Park Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 8d71a9b09005..a854cb3c965f 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -2641,6 +2641,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, /* default, set to non-periodic */ hs_ep->isochronous = 0; hs_ep->periodic = 0; + hs_ep->halted = 0; hs_ep->interval = desc->bInterval; if (hs_ep->interval > 1 && hs_ep->mc > 1) @@ -2842,6 +2843,8 @@ static int s3c_hsotg_ep_sethalt(struct usb_ep *ep, int value) writel(epctl, hs->regs + epreg); + hs_ep->halted = value; + return 0; }