diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-19 13:08:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 02:00:36 -0300 |
| commit | d6144028af6b151018c50c160e794a4d7f686333 (patch) | |
| tree | 39f1596643e5a394398a319fd31758169e6cf32f /drivers/media/video | |
| parent | 0463f12c5cdc3d5577002826c302471b95b2532c (diff) | |
| download | blackbird-op-linux-d6144028af6b151018c50c160e794a4d7f686333.tar.gz blackbird-op-linux-d6144028af6b151018c50c160e794a4d7f686333.zip | |
V4L/DVB (4036): Fix some compilation warnings
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/meye.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/usbvideo/quickcam_messenger.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/zoran_device.c | 2 |
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) static void meye_vm_open(struct vm_area_struct *vma) { - int idx = (int)vma->vm_private_data; + long idx = (long)vma->vm_private_data; meye.vma_use_count[idx]++; } static void meye_vm_close(struct vm_area_struct *vma) { - int idx = (int)vma->vm_private_data; + long idx = (long)vma->vm_private_data; meye.vma_use_count[idx]--; } 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, u16 saturation, u16 value) { int ret; - u16 r,g,b; + u16 r=0,g=0,b=0; /* this code is based on qc-usb-messenger */ 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, * All error messages are internal driver checking only! */ /* video display top and bottom registers */ - reg = (u32) zr->buffer.base + + reg = (long) zr->buffer.base + zr->overlay_settings.x * ((zr->overlay_settings.format->depth + 7) / 8) + zr->overlay_settings.y * |
