summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2020-01-03 17:35:13 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-11 04:33:51 -0800
commitdf3eb85b472fdbaa08e6712b8a64181d12470aad (patch)
tree3539a6e049712195666f1c5e5751f91fafb9b396
parentbdfaaf35ac49ef43d1f3a6ccf6f27b8e64f61828 (diff)
downloadlinux-stable-df3eb85b472fdbaa08e6712b8a64181d12470aad.tar.gz
linux-stable-df3eb85b472fdbaa08e6712b8a64181d12470aad.tar.bz2
linux-stable-df3eb85b472fdbaa08e6712b8a64181d12470aad.zip
media: iguanair: fix endpoint sanity check
[ Upstream commit 1b257870a78b0a9ce98fdfb052c58542022ffb5b ] Make sure to use the current alternate setting, which need not be the first one by index, when verifying the endpoint descriptors and initialising the URBs. Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on. Fixes: 26ff63137c45 ("[media] Add support for the IguanaWorks USB IR Transceiver") Fixes: ab1cbdf159be ("media: iguanair: add sanity checks") Cc: stable <stable@vger.kernel.org> # 3.6 Cc: Oliver Neukum <oneukum@suse.com> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/media/rc/iguanair.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index 6f3030b2054d..1df9522c30fa 100644
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -424,7 +424,7 @@ static int iguanair_probe(struct usb_interface *intf,
int ret, pipein, pipeout;
struct usb_host_interface *idesc;
- idesc = intf->altsetting;
+ idesc = intf->cur_altsetting;
if (idesc->desc.bNumEndpoints < 2)
return -ENODEV;