aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/meye.c4
-rw-r--r--drivers/media/video/usbvideo/quickcam_messenger.c2
-rw-r--r--drivers/media/video/zoran_device.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 850bee97090c..595a3ea7574e 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1682,13 +1682,13 @@ static unsigned int meye_poll(struct file *file, poll_table *wait)
1682 1682
1683static void meye_vm_open(struct vm_area_struct *vma) 1683static void meye_vm_open(struct vm_area_struct *vma)
1684{ 1684{
1685 int idx = (int)vma->vm_private_data; 1685 long idx = (long)vma->vm_private_data;
1686 meye.vma_use_count[idx]++; 1686 meye.vma_use_count[idx]++;
1687} 1687}
1688 1688
1689static void meye_vm_close(struct vm_area_struct *vma) 1689static void meye_vm_close(struct vm_area_struct *vma)
1690{ 1690{
1691 int idx = (int)vma->vm_private_data; 1691 long idx = (long)vma->vm_private_data;
1692 meye.vma_use_count[idx]--; 1692 meye.vma_use_count[idx]--;
1693} 1693}
1694 1694
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index 8ad9f6af89af..3f3182a24da1 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -343,7 +343,7 @@ static int qcm_sensor_set_gains(struct uvd *uvd, u16 hue,
343 u16 saturation, u16 value) 343 u16 saturation, u16 value)
344{ 344{
345 int ret; 345 int ret;
346 u16 r,g,b; 346 u16 r=0,g=0,b=0;
347 347
348 /* this code is based on qc-usb-messenger */ 348 /* this code is based on qc-usb-messenger */
349 qcm_hsv2rgb(hue, saturation, value, &r, &g, &b); 349 qcm_hsv2rgb(hue, saturation, value, &r, &g, &b);
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index c690b2ee880a..02168d9c2187 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -536,7 +536,7 @@ zr36057_overlay (struct zoran *zr,
536 * All error messages are internal driver checking only! */ 536 * All error messages are internal driver checking only! */
537 537
538 /* video display top and bottom registers */ 538 /* video display top and bottom registers */
539 reg = (u32) zr->buffer.base + 539 reg = (long) zr->buffer.base +
540 zr->overlay_settings.x * 540 zr->overlay_settings.x *
541 ((zr->overlay_settings.format->depth + 7) / 8) + 541 ((zr->overlay_settings.format->depth + 7) / 8) +
542 zr->overlay_settings.y * 542 zr->overlay_settings.y *