mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-20 08:22:39 +00:00
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: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
353facd4ab
commit
c6edaf1674
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user