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>

diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 10b8b85bc2597260bbe03a17ad0bbe42ae3c31ad..7b52600c935289292208bdff38866d023585501d 100644 (file)
--- 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 */