diff options
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp702x-fe.c | 5 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-vbi.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tuner-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/video-buf.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c index b6d95e1c9c52..2a89f8c5da99 100644 --- a/drivers/media/dvb/dvb-usb/vp702x-fe.c +++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c | |||
@@ -147,8 +147,9 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe, | |||
147 | cmd[4] = (sr >> 4) & 0xff; | 147 | cmd[4] = (sr >> 4) & 0xff; |
148 | cmd[5] = (sr << 4) & 0xf0; | 148 | cmd[5] = (sr << 4) & 0xf0; |
149 | 149 | ||
150 | deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %Lu (%Lx)\n", | 150 | deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %lu (%lx)\n", |
151 | fep->frequency,freq,freq, fep->u.qpsk.symbol_rate, sr, sr); | 151 | fep->frequency,freq,freq, fep->u.qpsk.symbol_rate, |
152 | (unsigned long) sr, (unsigned long) sr); | ||
152 | 153 | ||
153 | /* if (fep->inversion == INVERSION_ON) | 154 | /* if (fep->inversion == INVERSION_ON) |
154 | cmd[6] |= 0x80; */ | 155 | cmd[6] |= 0x80; */ |
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c index e20ff238e409..8c9f0f7cf467 100644 --- a/drivers/media/video/bt8xx/bttv-vbi.c +++ b/drivers/media/video/bt8xx/bttv-vbi.c | |||
@@ -184,7 +184,7 @@ void bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_format *f) | |||
184 | - tvnorm->vbistart[0]; | 184 | - tvnorm->vbistart[0]; |
185 | count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1] | 185 | count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1] |
186 | - tvnorm->vbistart[1]; | 186 | - tvnorm->vbistart[1]; |
187 | count = clamp (max (count0, count1), 1LL, (s64) VBI_MAXLINES); | 187 | count = clamp (max (count0, count1), (s64) 1, (s64) VBI_MAXLINES); |
188 | 188 | ||
189 | f->fmt.vbi.start[0] = tvnorm->vbistart[0]; | 189 | f->fmt.vbi.start[0] = tvnorm->vbistart[0]; |
190 | f->fmt.vbi.start[1] = tvnorm->vbistart[1]; | 190 | f->fmt.vbi.start[1] = tvnorm->vbistart[1]; |
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index df195c905366..bbcb281cc391 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -401,7 +401,7 @@ static void tuner_status(struct i2c_client *client) | |||
401 | } | 401 | } |
402 | tuner_info("Tuner mode: %s\n", p); | 402 | tuner_info("Tuner mode: %s\n", p); |
403 | tuner_info("Frequency: %lu.%02lu MHz\n", freq, freq_fraction); | 403 | tuner_info("Frequency: %lu.%02lu MHz\n", freq, freq_fraction); |
404 | tuner_info("Standard: 0x%08llx\n", t->std); | 404 | tuner_info("Standard: 0x%08lx\n", (unsigned long)t->std); |
405 | if (t->mode != V4L2_TUNER_RADIO) | 405 | if (t->mode != V4L2_TUNER_RADIO) |
406 | return; | 406 | return; |
407 | if (t->has_signal) { | 407 | if (t->has_signal) { |
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c index d2ca0f08d0df..fb09c43c0333 100644 --- a/drivers/media/video/video-buf.c +++ b/drivers/media/video/video-buf.c | |||
@@ -923,7 +923,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, | |||
923 | /* need to capture a new frame */ | 923 | /* need to capture a new frame */ |
924 | retval = -ENOMEM; | 924 | retval = -ENOMEM; |
925 | q->read_buf = videobuf_alloc(q->msize); | 925 | q->read_buf = videobuf_alloc(q->msize); |
926 | dprintk(1,"video alloc=0x%08x\n",(unsigned int) q->read_buf); | 926 | dprintk(1,"video alloc=0x%p\n", q->read_buf); |
927 | if (NULL == q->read_buf) | 927 | if (NULL == q->read_buf) |
928 | goto done; | 928 | goto done; |
929 | q->read_buf->memory = V4L2_MEMORY_USERPTR; | 929 | q->read_buf->memory = V4L2_MEMORY_USERPTR; |