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

Commit c6edaf16 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8511): gspca: Get the card name of QUERYCAP from the usb product name. 



This is a preliminary for using the driver_info of the struct
usb_device_id to handle the specific per webcam information.

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 353facd4

drivers/media/video/gspca/gspca.c

+10 −1
Original line number Diff line number Diff line
@@ -834,7 +834,16 @@ static int vidioc_querycap(struct file *file, void *priv, 


	memset(cap, 0, sizeof *cap);

	strncpy(cap->driver, gspca_dev->sd_desc->name, sizeof cap->driver);

	strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card);

/*	strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card); */

	if (gspca_dev->dev->product != NULL) {

		strncpy(cap->card, gspca_dev->dev->product,

			sizeof cap->card);

	} else {

		snprintf(cap->card, sizeof cap->card,

			"USB Camera (%04x:%04x)",

			le16_to_cpu(gspca_dev->dev->descriptor.idVendor),

			le16_to_cpu(gspca_dev->dev->descriptor.idProduct));

	}

	strncpy(cap->bus_info, gspca_dev->dev->bus->bus_name,

		sizeof cap->bus_info);

	cap->version = DRIVER_VERSION_NUMBER;