diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 80b31ebb5b95..442970073e8a 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -1297,17 +1297,19 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
1297 | ret = -ENODEV; | 1297 | ret = -ENODEV; |
1298 | goto out; | 1298 | goto out; |
1299 | } | 1299 | } |
1300 | strncpy(cap->driver, gspca_dev->sd_desc->name, sizeof cap->driver); | 1300 | strncpy((char *) cap->driver, gspca_dev->sd_desc->name, |
1301 | sizeof cap->driver); | ||
1301 | if (gspca_dev->dev->product != NULL) { | 1302 | if (gspca_dev->dev->product != NULL) { |
1302 | strncpy(cap->card, gspca_dev->dev->product, | 1303 | strncpy((char *) cap->card, gspca_dev->dev->product, |
1303 | sizeof cap->card); | 1304 | sizeof cap->card); |
1304 | } else { | 1305 | } else { |
1305 | snprintf(cap->card, sizeof cap->card, | 1306 | snprintf((char *) cap->card, sizeof cap->card, |
1306 | "USB Camera (%04x:%04x)", | 1307 | "USB Camera (%04x:%04x)", |
1307 | le16_to_cpu(gspca_dev->dev->descriptor.idVendor), | 1308 | le16_to_cpu(gspca_dev->dev->descriptor.idVendor), |
1308 | le16_to_cpu(gspca_dev->dev->descriptor.idProduct)); | 1309 | le16_to_cpu(gspca_dev->dev->descriptor.idProduct)); |
1309 | } | 1310 | } |
1310 | usb_make_path(gspca_dev->dev, cap->bus_info, sizeof(cap->bus_info)); | 1311 | usb_make_path(gspca_dev->dev, (char *) cap->bus_info, |
1312 | sizeof(cap->bus_info)); | ||
1311 | cap->version = DRIVER_VERSION_NUMBER; | 1313 | cap->version = DRIVER_VERSION_NUMBER; |
1312 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 1314 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
1313 | | V4L2_CAP_STREAMING | 1315 | | V4L2_CAP_STREAMING |