aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c4
-rw-r--r--drivers/media/video/ivtv/ivtv-streams.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 273d1154da17..57af1762de1f 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1007,7 +1007,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
1007 if (itv->hw_flags & IVTV_HW_CX25840) { 1007 if (itv->hw_flags & IVTV_HW_CX25840) {
1008 itv->vbi.sliced_decoder_line_size = itv->is_60hz ? 272 : 284; 1008 itv->vbi.sliced_decoder_line_size = itv->is_60hz ? 272 : 284;
1009 } 1009 }
1010 IVTV_DEBUG_INFO("Switching standard to %llx.\n", itv->std); 1010 IVTV_DEBUG_INFO("Switching standard to %llx.\n", (unsigned long long)itv->std);
1011 1011
1012 /* Tuner */ 1012 /* Tuner */
1013 ivtv_call_i2c_clients(itv, VIDIOC_S_STD, &itv->std); 1013 ivtv_call_i2c_clients(itv, VIDIOC_S_STD, &itv->std);
@@ -1237,7 +1237,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
1237 (s->buffers - s->q_free.buffers) * 100 / s->buffers, 1237 (s->buffers - s->q_free.buffers) * 100 / s->buffers,
1238 (s->buffers * s->buf_size) / 1024, s->buffers); 1238 (s->buffers * s->buf_size) / 1024, s->buffers);
1239 } 1239 }
1240 IVTV_INFO("Read MPEG/VBI: %lld/%lld bytes\n", itv->mpg_data_received, itv->vbi_data_inserted); 1240 IVTV_INFO("Read MPEG/VBI: %lld/%lld bytes\n", (long long)itv->mpg_data_received, (long long)itv->vbi_data_inserted);
1241 IVTV_INFO("================== END STATUS CARD #%d ==================\n", itv->num); 1241 IVTV_INFO("================== END STATUS CARD #%d ==================\n", itv->num);
1242 break; 1242 break;
1243 } 1243 }
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 01a41a844a30..6af88ae9295f 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -868,7 +868,7 @@ int ivtv_stop_v4l2_decode_stream(struct ivtv_stream *s, int flags, u64 pts)
868 if (!test_bit(IVTV_F_S_STREAMING, &s->s_flags)) 868 if (!test_bit(IVTV_F_S_STREAMING, &s->s_flags))
869 return 0; 869 return 0;
870 870
871 IVTV_DEBUG_INFO("Stop Decode at %llu, flags: %x\n", pts, flags); 871 IVTV_DEBUG_INFO("Stop Decode at %llu, flags: %x\n", (unsigned long long)pts, flags);
872 872
873 /* Stop Decoder */ 873 /* Stop Decoder */
874 if (!(flags & VIDEO_CMD_STOP_IMMEDIATELY) || pts) { 874 if (!(flags & VIDEO_CMD_STOP_IMMEDIATELY) || pts) {