Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 341f5b10 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'for-greg' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus 

* 'for-greg' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: gadget: epautoconf: do not change number of streams
  usb: dwc3: core: fix cached revision on our structure
  usb: musb: fix reset issue with full speed device
parents abf058e1 7422ba53

drivers/usb/dwc3/core.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int __devinit dwc3_core_init(struct dwc3 *dwc) 
		ret = -ENODEV;

		goto err0;

	}

	dwc->revision = reg & DWC3_GSNPSREV_MASK;

	dwc->revision = reg;



	dwc3_core_soft_reset(dwc);

drivers/usb/gadget/epautoconf.c

+0 −3
Original line number Diff line number Diff line
@@ -130,9 +130,6 @@ ep_matches ( 
			num_req_streams = ep_comp->bmAttributes & 0x1f;

			if (num_req_streams > ep->max_streams)

				return 0;

			/* Update the ep_comp descriptor if needed */

			if (num_req_streams != ep->max_streams)

				ep_comp->bmAttributes = ep->max_streams;

		}



	}

drivers/usb/musb/musb_host.c

+4 −0
Original line number Diff line number Diff line
@@ -774,6 +774,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum, 
			if (musb->double_buffer_not_ok)

				musb_writew(epio, MUSB_TXMAXP,

						hw_ep->max_packet_sz_tx);

			else if (can_bulk_split(musb, qh->type))

				musb_writew(epio, MUSB_TXMAXP, packet_sz

					| ((hw_ep->max_packet_sz_tx /

						packet_sz) - 1) << 11);

			else

				musb_writew(epio, MUSB_TXMAXP,

						qh->maxpacket |