summary refs log tree commit diff
path: root/drivers/usb
diff options
context:
space:
mode:
authorPaul Cercueil <paul@crapouillou.net>2021-01-23 14:25:00 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-05 10:27:18 +0100
commitae2938c358430beab098fbfac843532c25b36372 (patch)
treeb046c47663acd81e2a60887c165c58202bcaaf0c /drivers/usb
parent0eaa1a3714db34a59ce121de5733c3909c529463 (diff)
downloadlinux-ae2938c358430beab098fbfac843532c25b36372.tar.gz
usb: musb: Fix NULL check on struct musb_request field
The 'request' variable is a pointer to the 'request' field of the
struct musb_request 'req' pointer. It only worked until now because
the 'request' field is the first one in the musb_request structure, but
as soon as that changes, the check will be invalid.

Fix it preventively by doing the NULL-check on the 'req' pointer
instead.

Suggested-by: Maarten ter Huurne <maarten@treewalker.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20210123142502.16980-2-paul@crapouillou.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/musb_gadget.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index f62ffaede1ab..ef374d4dd94a 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -451,7 +451,7 @@ void musb_g_tx(struct musb *musb, u8 epnum)
 		return;
 	}
 
-	if (request) {
+	if (req) {
 
 		trace_musb_req_tx(req);