aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/chipidea/udc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-14 19:43:09 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-14 19:43:09 -0400
commit37a842d36f63a047d94be2603d40d4407c949f1b (patch)
tree6aed94775f66f7198130b725bb5c7eae98faacdb /drivers/usb/chipidea/udc.c
parenta3fbedf98fe9909cb2e406e2018ec437d64806f6 (diff)
parent96625eadca1bb8832fb502f0899a543695f1ba35 (diff)
Merge tag 'usb-ci-v4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Peter writes: USB: chipidea updates for v4.3-rc1 The main changes are adding several system interfaces for tuning performance, and each vendors can adjust them according to their design configurations. Others are tiny improvements, like more well siTD supports, USB_DEVICE_A_HNP_SUPPORT supports, etc.
Diffstat (limited to 'drivers/usb/chipidea/udc.c')
-rw-r--r--drivers/usb/chipidea/udc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index c592b6f0fe21..a637da25dda0 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -445,7 +445,7 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
445 rest -= count; 445 rest -= count;
446 } 446 }
447 447
448 if (hwreq->req.zero && hwreq->req.length 448 if (hwreq->req.zero && hwreq->req.length && hwep->dir == TX
449 && (hwreq->req.length % hwep->ep.maxpacket == 0)) 449 && (hwreq->req.length % hwep->ep.maxpacket == 0))
450 add_td_to_list(hwep, hwreq, 0); 450 add_td_to_list(hwep, hwreq, 0);
451 451
@@ -1090,6 +1090,13 @@ __acquires(ci->lock)
1090 if (ci_otg_is_fsm_mode(ci)) 1090 if (ci_otg_is_fsm_mode(ci))
1091 err = otg_a_alt_hnp_support(ci); 1091 err = otg_a_alt_hnp_support(ci);
1092 break; 1092 break;
1093 case USB_DEVICE_A_HNP_SUPPORT:
1094 if (ci_otg_is_fsm_mode(ci)) {
1095 ci->gadget.a_hnp_support = 1;
1096 err = isr_setup_status_phase(
1097 ci);
1098 }
1099 break;
1093 default: 1100 default:
1094 goto delegate; 1101 goto delegate;
1095 } 1102 }