Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4385098 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5751): Ivtv: fix ia64 printk format warnings. 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 72fb39ea

drivers/media/video/ivtv/ivtv-ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void 
		if (itv->hw_flags & IVTV_HW_CX25840) {

			itv->vbi.sliced_decoder_line_size = itv->is_60hz ? 272 : 284;

		}

		IVTV_DEBUG_INFO("Switching standard to %llx.\n", itv->std);

		IVTV_DEBUG_INFO("Switching standard to %llx.\n", (unsigned long long)itv->std);



		/* Tuner */

		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 
					(s->buffers - s->q_free.buffers) * 100 / s->buffers,

					(s->buffers * s->buf_size) / 1024, s->buffers);

		}

		IVTV_INFO("Read MPEG/VBI: %lld/%lld bytes\n", itv->mpg_data_received, itv->vbi_data_inserted);

		IVTV_INFO("Read MPEG/VBI: %lld/%lld bytes\n", (long long)itv->mpg_data_received, (long long)itv->vbi_data_inserted);

		IVTV_INFO("==================  END STATUS CARD #%d  ==================\n", itv->num);

		break;

	}

drivers/media/video/ivtv/ivtv-streams.c

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ int ivtv_stop_v4l2_decode_stream(struct ivtv_stream *s, int flags, u64 pts) 
	if (!test_bit(IVTV_F_S_STREAMING, &s->s_flags))

		return 0;



	IVTV_DEBUG_INFO("Stop Decode at %llu, flags: %x\n", pts, flags);

	IVTV_DEBUG_INFO("Stop Decode at %llu, flags: %x\n", (unsigned long long)pts, flags);



	/* Stop Decoder */

	if (!(flags & VIDEO_CMD_STOP_IMMEDIATELY) || pts) {