diff options
| author | Robert Baldyga | 2015-07-28 07:20:02 +0200 |
|---|---|---|
| committer | Felipe Balbi | 2015-07-30 18:43:36 +0200 |
| commit | 7a896d40525349e7d52307fb957882696e09466c (patch) | |
| tree | 4f6fe25e55bc3d7785b22d9b7a5aa19b428ed8d5 | |
| parent | usb: gadget: f_mass_storage: check quirk instead of UDC name (diff) | |
| download | kernel-qcow2-linux-7a896d40525349e7d52307fb957882696e09466c.tar.gz kernel-qcow2-linux-7a896d40525349e7d52307fb957882696e09466c.tar.xz kernel-qcow2-linux-7a896d40525349e7d52307fb957882696e09466c.zip | |
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>
| -rw-r--r-- | drivers/usb/gadget/function/f_ecm.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/function/f_ncm.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c index 798760fa7e70..7b7424f10ddd 100644 --- a/drivers/usb/gadget/function/f_ecm.c +++ b/drivers/usb/gadget/function/f_ecm.c @@ -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); diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c index bdcda9f5148e..3f05c6bd57f0 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -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); |