---

yaml --- r: 241761 b: refs/heads/master c: 08b99e2 h: refs/heads/master i: 241759: 9926205 v: v3
git-mirror · Mar 21, 2011 · 5f13466 · 5f13466
1 parent c12841e
commit 5f13466
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b25748fe612626d6c9e344482bb028d76c1e11f2
+refs/heads/master: 08b99e26a347441c50c1113802801a122dd1eb7a
diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c
@@ -1635,7 +1635,7 @@ static size_t __vb2_perform_fileio(struct vb2_queue *q, char __user *data, size_
 	struct vb2_fileio_buf *buf;
 	int ret, index;
 
-	dprintk(3, "file io: mode %s, offset %ld, count %ld, %sblocking\n",
+	dprintk(3, "file io: mode %s, offset %ld, count %zd, %sblocking\n",
 		read ? "read" : "write", (long)*ppos, count,
 		nonblock ? "non" : "");
 
@@ -1694,13 +1694,13 @@ static size_t __vb2_perform_fileio(struct vb2_queue *q, char __user *data, size_
 	 */
 	if (buf->pos + count > buf->size) {
 		count = buf->size - buf->pos;
-		dprintk(5, "reducing read count: %ld\n", count);
+		dprintk(5, "reducing read count: %zd\n", count);
 	}
 
 	/*
 	 * Transfer data to userspace.
 	 */
-	dprintk(3, "file io: copying %ld bytes - buffer %d, offset %u\n",
+	dprintk(3, "file io: copying %zd bytes - buffer %d, offset %u\n",
 		count, index, buf->pos);
 	if (read)
 		ret = copy_to_user(data, buf->vaddr + buf->pos, count);