From: Mauro Carvalho Chehab Date: Sun, 27 Jul 2014 19:27:27 +0000 (-0300) Subject: [media] cx231xx: Fix the max number of interfaces X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=139d28826b8e2bc7a9232fde0d2f14812914f501;p=deliverable%2Flinux.git [media] cx231xx: Fix the max number of interfaces The max number of interfaces was read from the wrong descriptor. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 2ee03e4ddd86..6d785db96d99 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1185,8 +1185,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 */