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

Commit 7a896d40 authored Jul 28, 2015 by Robert Baldyga Committed by Felipe Balbi Jul 30, 2015

usb: gadget: f_ecm/f_ncm: check quirk instead of UDC name



Use generic mechanism to check if UDC controller supports zlp.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent a4cc4215

drivers/usb/gadget/function/f_ecm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -585,8 +585,8 @@ static int ecm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
		/* Enable zlps by default for ECM conformance;
		* override for musb_hdrc (avoids txdma ovhead).
		*/
		ecm->port.is_zlp_ok = !(gadget_is_musbhdrc(cdev->gadget)
		);
		ecm->port.is_zlp_ok =
		gadget_is_zlp_supported(cdev->gadget);
		ecm->port.cdc_filter = DEFAULT_FILTER;
		DBG(cdev, "activate ecm\n");
		net = gether_connect(&ecm->port);

drivers/usb/gadget/function/f_ncm.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -853,9 +853,8 @@ static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
		/* Enable zlps by default for NCM conformance;
		* override for musb_hdrc (avoids txdma ovhead)
		*/
		ncm->port.is_zlp_ok = !(
		gadget_is_musbhdrc(cdev->gadget)
		);
		ncm->port.is_zlp_ok =
		gadget_is_zlp_supported(cdev->gadget);
		ncm->port.cdc_filter = DEFAULT_FILTER;
		DBG(cdev, "activate ncm\n");
		net = gether_connect(&ncm->port);