Samsung VZW MB1 update
/drivers/usb/gadget/ci13xxx_udc.c
blob:8ffe991f41213413c4fe9a4ed28374551460a2e4 -> blob:d3754f1ae5689562595135cea24e50eec2ade71d
--- drivers/usb/gadget/ci13xxx_udc.c
+++ drivers/usb/gadget/ci13xxx_udc.c
@@ -2392,7 +2392,6 @@ static int ep_enable(struct usb_ep *ep,
struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
int retval = 0;
unsigned long flags;
- unsigned mult = 0;
trace("%p, %p", ep, desc);
@@ -2418,15 +2417,12 @@ static int ep_enable(struct usb_ep *ep,
mEp->qh.ptr->cap = 0;
- if (mEp->type == USB_ENDPOINT_XFER_CONTROL) {
+ if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
mEp->qh.ptr->cap |= QH_IOS;
- } else if (mEp->type == USB_ENDPOINT_XFER_ISOC) {
+ else if (mEp->type == USB_ENDPOINT_XFER_ISOC)
mEp->qh.ptr->cap &= ~QH_MULT;
- mult = ((mEp->ep.maxpacket >> QH_MULT_SHIFT) + 1) & 0x03;
- mEp->qh.ptr->cap |= (mult << ffs_nr(QH_MULT));
- } else {
+ else
mEp->qh.ptr->cap |= QH_ZLT;
- }
mEp->qh.ptr->cap |=
(mEp->ep.maxpacket << ffs_nr(QH_MAX_PKT)) & QH_MAX_PKT;
@@ -2960,12 +2956,7 @@ int usb_gadget_probe_driver(struct usb_g
mEp->ep.name = mEp->name;
mEp->ep.ops = &usb_ep_ops;
-
- if (i == 0)
- mEp->ep.maxpacket = CTRL_PAYLOAD_MAX;
- else
- /* For ISO EP */
- mEp->ep.maxpacket = 512;
+ mEp->ep.maxpacket = CTRL_PAYLOAD_MAX;
INIT_LIST_HEAD(&mEp->qh.queue);
spin_unlock_irqrestore(udc->lock, flags);