Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10e4ebb6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx231xx: Only register USB interface 1 



Interface 0 is used by IR. The current driver starts initializing
on it, finishing on interface 6. Change the logic to only handle
interface 1. This allows another driver (mceusb) to take care of
the IR interface.

Reviewed-by: default avatarJarod Wilson <jarod@redhat.com>
Acked-by: default avatarSri Devi <Srinivasa.Deevi@conexant.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 56e92f60

drivers/media/video/cx231xx/cx231xx-cards.c

+8 −30
Original line number Diff line number Diff line
@@ -793,13 +793,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
	char *speed;

	char descr[255] = "";

	struct usb_interface *lif = NULL;

	int skip_interface = 0;

	struct usb_interface_assoc_descriptor *assoc_desc;



	udev = usb_get_dev(interface_to_usbdev(interface));

	ifnum = interface->altsetting[0].desc.bInterfaceNumber;



	if (!ifnum) {

	if (ifnum == 1) {

		/*

		 * Interface number 0 - IR interface

		 */
@@ -886,13 +885,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		     le16_to_cpu(udev->descriptor.idVendor),

		     le16_to_cpu(udev->descriptor.idProduct),

		     dev->max_iad_interface_count);

	} else {

		/* Get dev structure first */

		dev = usb_get_intfdata(udev->actconfig->interface[0]);

		if (dev == NULL) {

			cx231xx_err(DRIVER_NAME ": out of first interface!\n");

			return -ENODEV;

		}



		/* store the interface 0 back */

		lif = udev->actconfig->interface[0];
@@ -903,35 +895,21 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		/* get device number */

		nr = dev->devno;



		/*

		 * set skip interface, for all interfaces but

		 * interface 1 and the last one

		 */

		if ((ifnum != 1) && ((ifnum)

				     != dev->max_iad_interface_count))

			skip_interface = 1;



		if (ifnum == 1) {

		assoc_desc = udev->actconfig->intf_assoc[0];

		if (assoc_desc->bFirstInterface != ifnum) {

			cx231xx_err(DRIVER_NAME ": Not found "

				    "matching IAD interface\n");

			return -ENODEV;

		}

		}

	}



	if (skip_interface)

	} else {

		return -ENODEV;

	}



	cx231xx_info("registering interface %d\n", ifnum);



	/* save our data pointer in this interface device */

	usb_set_intfdata(lif, dev);



	if ((ifnum) != dev->max_iad_interface_count)

		return 0;



	/*

	 * AV device initialization - only done at the last interface

	 */