media: flexcop-usb: clean up endpoint sanity checks

[ Upstream commit 3de50478b5 ]

Add a temporary variable to make the endpoint sanity checks a bit more
readable.

While at it, fix a typo in the usb_set_interface() comment.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20220822151456.27178-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: f62dc8f6bf82 ("media: flexcop-usb: fix sanity check of bNumEndpoints")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johan Hovold 2022-08-22 17:14:54 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель f99809fdeb
Коммит 061057a949
1 изменённых файлов: 8 добавлений и 4 удалений

Просмотреть файл

@ -501,17 +501,21 @@ urb_error:
static int flexcop_usb_init(struct flexcop_usb *fc_usb)
{
/* use the alternate setting with the larges buffer */
int ret = usb_set_interface(fc_usb->udev, 0, 1);
struct usb_host_interface *alt;
int ret;
/* use the alternate setting with the largest buffer */
ret = usb_set_interface(fc_usb->udev, 0, 1);
if (ret) {
err("set interface failed.");
return ret;
}
if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1)
alt = fc_usb->uintf->cur_altsetting;
if (alt->desc.bNumEndpoints < 1)
return -ENODEV;
if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[0].desc))
if (!usb_endpoint_is_isoc_in(&alt->endpoint[0].desc))
return -ENODEV;
switch (fc_usb->udev->speed) {