diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
commit | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (patch) | |
tree | a5d2a80f121a5c854773ddc85b1d9cbd6b840861 /drivers/usb/gadget/fsl_qe_udc.c | |
parent | e1eaf354528ceb002c8e2840a55c44cd76aaaed8 (diff) | |
parent | 06d5631f56460917af3d9417ef63811cf0cad9ce (diff) | |
download | linux-7b98cf0cf4e8798b9e7435f966ed0d90a2a925de.tar.bz2 |
Merge branch 'common/pfc' into sh-latest
Diffstat (limited to 'drivers/usb/gadget/fsl_qe_udc.c')
-rw-r--r-- | drivers/usb/gadget/fsl_qe_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c index 51881f3bd07a..b09452d6f33a 100644 --- a/drivers/usb/gadget/fsl_qe_udc.c +++ b/drivers/usb/gadget/fsl_qe_udc.c @@ -1596,7 +1596,7 @@ static int qe_ep_enable(struct usb_ep *_ep, ep = container_of(_ep, struct qe_ep, ep); /* catch various bogus parameters */ - if (!_ep || !desc || ep->ep.desc || _ep->name == ep_name[0] || + if (!_ep || !desc || _ep->name == ep_name[0] || (desc->bDescriptorType != USB_DT_ENDPOINT)) return -EINVAL; |