summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/adv7170.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-18 11:35:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-18 11:35:10 -0300
commit0f2ea07a22d87dcff3529fd787f8b41ed665bb28 (patch)
treed07f4c43fbc9be212164e66e1d03cecec5503674 /linux/drivers/media/video/adv7170.c
parentd10ad49b94839cf1917bc102be086dc5de329208 (diff)
parent001bc08cc9ccdaf3efc87846858fb8d555e7f9cf (diff)
downloadmediapointer-dvb-s2-0f2ea07a22d87dcff3529fd787f8b41ed665bb28.tar.gz
mediapointer-dvb-s2-0f2ea07a22d87dcff3529fd787f8b41ed665bb28.tar.bz2
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/adv7170.c')
-rw-r--r--linux/drivers/media/video/adv7170.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/adv7170.c b/linux/drivers/media/video/adv7170.c
index 87bc8ed46..04e6125f2 100644
--- a/linux/drivers/media/video/adv7170.c
+++ b/linux/drivers/media/video/adv7170.c
@@ -205,7 +205,7 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
{
struct adv7170 *encoder = to_adv7170(sd);
- v4l2_dbg(1, debug, sd, "set norm %llx\n", std);
+ v4l2_dbg(1, debug, sd, "set norm %llx\n", (unsigned long long)std);
if (std & V4L2_STD_NTSC) {
adv7170_write_block(sd, init_NTSC, sizeof(init_NTSC));
@@ -220,10 +220,11 @@ static int adv7170_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
adv7170_write(sd, 0x07, TR0MODE | TR0RST);
adv7170_write(sd, 0x07, TR0MODE);
} else {
- v4l2_dbg(1, debug, sd, "illegal norm: %llx\n", std);
+ v4l2_dbg(1, debug, sd, "illegal norm: %llx\n",
+ (unsigned long long)std);
return -EINVAL;
}
- v4l2_dbg(1, debug, sd, "switched to %llx\n", std);
+ v4l2_dbg(1, debug, sd, "switched to %llx\n", (unsigned long long)std);
encoder->norm = std;
return 0;
}