Commit 4ae5c2e5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (3614): Fix compilation warning at powerpc platform 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 31bc09b5

drivers/media/dvb/dvb-usb/vp702x-fe.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -147,8 +147,9 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe, 
	cmd[4] = (sr >> 4)  & 0xff;

	cmd[4] = (sr >> 4)  & 0xff;

	cmd[5] = (sr << 4)  & 0xf0;

	cmd[5] = (sr << 4)  & 0xf0;





	deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %Lu (%Lx)\n",

	deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %lu (%lx)\n",

			fep->frequency,freq,freq, fep->u.qpsk.symbol_rate, sr, sr);

			fep->frequency,freq,freq, fep->u.qpsk.symbol_rate,

			(unsigned long) sr, (unsigned long) sr);





/*	if (fep->inversion == INVERSION_ON)

/*	if (fep->inversion == INVERSION_ON)

		cmd[6] |= 0x80; */

		cmd[6] |= 0x80; */

drivers/media/video/bt8xx/bttv-vbi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ void bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_format *f) 
		- tvnorm->vbistart[0];

		- tvnorm->vbistart[0];

	count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1]

	count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1]

		- tvnorm->vbistart[1];

		- tvnorm->vbistart[1];

	count  = clamp (max (count0, count1), 1LL, (s64) VBI_MAXLINES);

	count  = clamp (max (count0, count1), (s64) 1, (s64) VBI_MAXLINES);





	f->fmt.vbi.start[0] = tvnorm->vbistart[0];

	f->fmt.vbi.start[0] = tvnorm->vbistart[0];

	f->fmt.vbi.start[1] = tvnorm->vbistart[1];

	f->fmt.vbi.start[1] = tvnorm->vbistart[1];

drivers/media/video/tuner-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -401,7 +401,7 @@ static void tuner_status(struct i2c_client *client) 
	}

	}

	tuner_info("Tuner mode:      %s\n", p);

	tuner_info("Tuner mode:      %s\n", p);

	tuner_info("Frequency:       %lu.%02lu MHz\n", freq, freq_fraction);

	tuner_info("Frequency:       %lu.%02lu MHz\n", freq, freq_fraction);

	tuner_info("Standard:        0x%08llx\n", t->std);

	tuner_info("Standard:        0x%08lx\n", (unsigned long)t->std);

	if (t->mode != V4L2_TUNER_RADIO)

	if (t->mode != V4L2_TUNER_RADIO)

	       return;

	       return;

	if (t->has_signal) {

	if (t->has_signal) {

drivers/media/video/video-buf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -923,7 +923,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, 
		/* need to capture a new frame */

		/* need to capture a new frame */

		retval = -ENOMEM;

		retval = -ENOMEM;

		q->read_buf = videobuf_alloc(q->msize);

		q->read_buf = videobuf_alloc(q->msize);

		dprintk(1,"video alloc=0x%08x\n",(unsigned int) q->read_buf);

		dprintk(1,"video alloc=0x%p\n", q->read_buf);

		if (NULL == q->read_buf)

		if (NULL == q->read_buf)

			goto done;

			goto done;

		q->read_buf->memory = V4L2_MEMORY_USERPTR;

		q->read_buf->memory = V4L2_MEMORY_USERPTR;