summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>2020-10-18 16:51:53 +0000
committerAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>2020-10-18 16:51:53 +0000
commit0d31777c5f1bbd0307d23c66a1af5180a1e7a4ed (patch)
treeca1d48f80af6f781ae1832bbfaacf69ecb3ac1b0 /drivers/staging
parent4236f3c63f99cbd22601f4158f8a6166688af5b3 (diff)
parent52f6ded2a377ac4f191c84182488e454b1386239 (diff)
Merge tag 'v5.4.72' into 5.4-2.1.x-imx
This is the 5.4.72 stable release Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/vmk80xx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index 65dc6c51037e..7956abcbae22 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -667,6 +667,9 @@ static int vmk80xx_find_usb_endpoints(struct comedi_device *dev)
if (!devpriv->ep_rx || !devpriv->ep_tx)
return -ENODEV;
+ if (!usb_endpoint_maxp(devpriv->ep_rx) || !usb_endpoint_maxp(devpriv->ep_tx))
+ return -EINVAL;
+
return 0;
}