| From foo@baz Thu May 24 11:23:00 CEST 2018 |
| From: Stefan Agner <stefan@agner.ch> |
| Date: Mon, 12 Feb 2018 00:14:42 +0100 |
| Subject: usb: gadget: fsl_udc_core: fix ep valid checks |
| |
| From: Stefan Agner <stefan@agner.ch> |
| |
| [ Upstream commit 20c63f4089cceab803438c383631963e34c4d8e5 ] |
| |
| Clang reports the following warning: |
| drivers/usb/gadget/udc/fsl_udc_core.c:1312:10: warning: address of array |
| 'ep->name' will always evaluate to 'true' [-Wpointer-bool-conversion] |
| if (ep->name) |
| ~~ ~~~~^~~~ |
| |
| It seems that the authors intention was to check if the ep has been |
| configured through struct_ep_setup. Check whether struct usb_ep name |
| pointer has been set instead. |
| |
| Signed-off-by: Stefan Agner <stefan@agner.ch> |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/usb/gadget/udc/fsl_udc_core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/gadget/udc/fsl_udc_core.c |
| +++ b/drivers/usb/gadget/udc/fsl_udc_core.c |
| @@ -1310,7 +1310,7 @@ static void udc_reset_ep_queue(struct fs |
| { |
| struct fsl_ep *ep = get_ep_by_pipe(udc, pipe); |
| |
| - if (ep->name) |
| + if (ep->ep.name) |
| nuke(ep, -ESHUTDOWN); |
| } |
| |
| @@ -1698,7 +1698,7 @@ static void dtd_complete_irq(struct fsl_ |
| curr_ep = get_ep_by_pipe(udc, i); |
| |
| /* If the ep is configured */ |
| - if (curr_ep->name == NULL) { |
| + if (!curr_ep->ep.name) { |
| WARNING("Invalid EP?"); |
| continue; |
| } |
