diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-27 16:27:27 -0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-02-13 18:32:24 +0000 |
| commit | 7fcb93a6ae743ce81e4d932c27afd77f34705117 (patch) | |
| tree | a1cd519c61790edb4fad2033f05530890b5d9f9a | |
| parent | 41ffa4f1c1480fe4392c6e1c48346a49d048ff4a (diff) | |
cx231xx: Fix the max number of interfaces
commit 139d28826b8e2bc7a9232fde0d2f14812914f501 upstream.
The max number of interfaces was read from the wrong descriptor.
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-cards.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index 10b8b85bc259..7b52600c9352 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c @@ -1070,8 +1070,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, dev->vbi_or_sliced_cc_mode = 0; /* get maximum no.of IAD interfaces */ - assoc_desc = udev->actconfig->intf_assoc[0]; - dev->max_iad_interface_count = assoc_desc->bInterfaceCount; + dev->max_iad_interface_count = udev->config->desc.bNumInterfaces; /* init CIR module TBD */ |