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>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 2a416cf205aa..ab053a26023e 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -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;