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

Commit 4462864d authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: gspca - main: Function gspca_dev_probe2 added 



This function is used when the USB video interface is checked by
the subdriver.

Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 618a864e

drivers/media/video/gspca/gspca.c

+31 −15
Original line number Original line Diff line number Diff line
@@ -2253,31 +2253,18 @@ static struct video_device gspca_template = { 
 * This function must be called by the sub-driver when it is

 * This function must be called by the sub-driver when it is

 * called for probing a new device.

 * called for probing a new device.

 */

 */

int gspca_dev_probe(struct usb_interface *intf,

int gspca_dev_probe2(struct usb_interface *intf,

		const struct usb_device_id *id,

		const struct usb_device_id *id,

		const struct sd_desc *sd_desc,

		const struct sd_desc *sd_desc,

		int dev_size,

		int dev_size,

		struct module *module)

		struct module *module)

{

{

	struct usb_interface_descriptor *interface;

	struct gspca_dev *gspca_dev;

	struct gspca_dev *gspca_dev;

	struct usb_device *dev = interface_to_usbdev(intf);

	struct usb_device *dev = interface_to_usbdev(intf);

	int ret;

	int ret;





	PDEBUG(D_PROBE, "probing %04x:%04x", id->idVendor, id->idProduct);

	PDEBUG(D_PROBE, "probing %04x:%04x", id->idVendor, id->idProduct);





	/* we don't handle multi-config cameras */

	if (dev->descriptor.bNumConfigurations != 1) {

		PDEBUG(D_ERR, "Too many config");

		return -ENODEV;

	}



	/* the USB video interface must be the first one */

	interface = &intf->cur_altsetting->desc;

	if (dev->config->desc.bNumInterfaces != 1 &&

	    interface->bInterfaceNumber != 0)

		return -ENODEV;



	/* create the device */

	/* create the device */

	if (dev_size < sizeof *gspca_dev)

	if (dev_size < sizeof *gspca_dev)

		dev_size = sizeof *gspca_dev;

		dev_size = sizeof *gspca_dev;
@@ -2293,7 +2280,7 @@ int gspca_dev_probe(struct usb_interface *intf, 
		goto out;

		goto out;

	}

	}

	gspca_dev->dev = dev;

	gspca_dev->dev = dev;

	gspca_dev->iface = interface->bInterfaceNumber;

	gspca_dev->iface = intf->cur_altsetting->desc.bInterfaceNumber;

	gspca_dev->nbalt = intf->num_altsetting;

	gspca_dev->nbalt = intf->num_altsetting;

	gspca_dev->sd_desc = sd_desc;

	gspca_dev->sd_desc = sd_desc;

	gspca_dev->nbufread = 2;

	gspca_dev->nbufread = 2;
@@ -2345,6 +2332,35 @@ out: 
	kfree(gspca_dev);

	kfree(gspca_dev);

	return ret;

	return ret;

}

}

EXPORT_SYMBOL(gspca_dev_probe2);



/* same function as the previous one, but check the interface */

int gspca_dev_probe(struct usb_interface *intf,

		const struct usb_device_id *id,

		const struct sd_desc *sd_desc,

		int dev_size,

		struct module *module)

{

	struct usb_device *dev = interface_to_usbdev(intf);



	/* we don't handle multi-config cameras */

	if (dev->descriptor.bNumConfigurations != 1) {

		PDEBUG(D_ERR, "%04x:%04x too many config",

				id->idVendor, id->idProduct);

		return -ENODEV;

	}



	/* the USB video interface must be the first one */

	if (dev->config->desc.bNumInterfaces != 1

	 && intf->cur_altsetting->desc.bInterfaceNumber != 0) {

		PDEBUG(D_ERR, "%04x:%04x bad interface %d",

				id->idVendor, id->idProduct,

				intf->cur_altsetting->desc.bInterfaceNumber);

		return -ENODEV;

	}



	return gspca_dev_probe2(intf, id, sd_desc, dev_size, module);

}

EXPORT_SYMBOL(gspca_dev_probe);

EXPORT_SYMBOL(gspca_dev_probe);





/*

/*

drivers/media/video/gspca/gspca.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -217,6 +217,11 @@ int gspca_dev_probe(struct usb_interface *intf, 
		const struct sd_desc *sd_desc,

		const struct sd_desc *sd_desc,

		int dev_size,

		int dev_size,

		struct module *module);

		struct module *module);

int gspca_dev_probe2(struct usb_interface *intf,

		const struct usb_device_id *id,

		const struct sd_desc *sd_desc,

		int dev_size,

		struct module *module);

void gspca_disconnect(struct usb_interface *intf);

void gspca_disconnect(struct usb_interface *intf);

void gspca_frame_add(struct gspca_dev *gspca_dev,

void gspca_frame_add(struct gspca_dev *gspca_dev,

			enum gspca_packet_type packet_type,

			enum gspca_packet_type packet_type,