summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/s3c-hsotg.c
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2013-09-19 11:50:21 +0200
committerFelipe Balbi <balbi@ti.com>2013-10-15 08:44:52 -0500
commita18ed7b036454794dc2d18b92e531c76953d556f (patch)
treee1f8878972db4b13908a1c378e6408918792b901 /drivers/usb/gadget/s3c-hsotg.c
parent7e8046505c9fda30c3c2a64f1cc84390e2458c54 (diff)
downloadlinux-a18ed7b036454794dc2d18b92e531c76953d556f.tar.gz
linux-a18ed7b036454794dc2d18b92e531c76953d556f.tar.bz2
linux-a18ed7b036454794dc2d18b92e531c76953d556f.zip
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 <r.baldyga@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/s3c-hsotg.c')
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c3
1 files changed, 3 insertions, 0 deletions
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;
}