aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-06-22 13:19:49 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:13:39 -0400
commit9c169df8d6877c618587bf40498f2ef378c97eb8 (patch)
tree95279756106e499f5c2e7930aad0939661a2d1f8
parent86ecc02755ea2d00925b344272b49b26d610bbe2 (diff)
V4L/DVB (8134): zoran annotations and fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/zoran_card.c2
-rw-r--r--drivers/media/video/zoran_driver.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 24afe81a59de..5ce1ec7338bf 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -1138,7 +1138,7 @@ zr36057_init (struct zoran *zr)
1138 goto exit_free; 1138 goto exit_free;
1139 } 1139 }
1140 for (j = 0; j < BUZ_NUM_STAT_COM; j++) { 1140 for (j = 0; j < BUZ_NUM_STAT_COM; j++) {
1141 zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ 1141 zr->stat_com[j] = cpu_to_le32(1); /* mark as unavailable to zr36057 */
1142 } 1142 }
1143 1143
1144 /* 1144 /*
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 8764c352061d..c0675921fe20 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -2794,7 +2794,7 @@ zoran_do_ioctl (struct inode *inode,
2794 { 2794 {
2795 struct v4l2_format *fmt = arg; 2795 struct v4l2_format *fmt = arg;
2796 int i, res = 0; 2796 int i, res = 0;
2797 __u32 printformat; 2797 __le32 printformat;
2798 2798
2799 dprintk(3, KERN_DEBUG "%s: VIDIOC_S_FMT - type=%d, ", 2799 dprintk(3, KERN_DEBUG "%s: VIDIOC_S_FMT - type=%d, ",
2800 ZR_DEVNAME(zr), fmt->type); 2800 ZR_DEVNAME(zr), fmt->type);
@@ -3039,7 +3039,7 @@ zoran_do_ioctl (struct inode *inode,
3039 { 3039 {
3040 int i, res = 0; 3040 int i, res = 0;
3041 struct v4l2_framebuffer *fb = arg; 3041 struct v4l2_framebuffer *fb = arg;
3042 __u32 printformat = __cpu_to_le32(fb->fmt.pixelformat); 3042 __le32 printformat = __cpu_to_le32(fb->fmt.pixelformat);
3043 3043
3044 dprintk(3, 3044 dprintk(3,
3045 KERN_DEBUG 3045 KERN_DEBUG