aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-09 04:26:26 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:19:18 -0400
commita9e1113483f110723e4c0277a05d08f51da232aa (patch)
treef7f935b57c8f1c7203244a122699d8a65b9d8a07
parenta47cacbd869b67ce16981ad5a0b06e4eac2efaff (diff)
V4L/DVB (8253): gspca: fix warnings on x86_64
/home/v4l/master/v4l/gspca.c: In function 'gspca_frame_add': /home/v4l/master/v4l/gspca.c:222: warning: format '%d' expects type 'int', but argument 2 has type 'long int' /home/v4l/master/v4l/gspca.c: In function 'dev_read': /home/v4l/master/v4l/gspca.c:1568: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' /home/v4l/master/v4l/gspca.c:1618: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/gspca/gspca.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 77e5e4f4335b..09f190c689d5 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -216,7 +216,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
216 if (len > 0) { 216 if (len > 0) {
217 if (frame->data_end - frame->data + len 217 if (frame->data_end - frame->data + len
218 > frame->v4l2_buf.length) { 218 > frame->v4l2_buf.length) {
219 PDEBUG(D_ERR|D_PACK, "frame overflow %d > %d", 219 PDEBUG(D_ERR|D_PACK, "frame overflow %zd > %d",
220 frame->data_end - frame->data + len, 220 frame->data_end - frame->data + len,
221 frame->v4l2_buf.length); 221 frame->v4l2_buf.length);
222 packet_type = DISCARD_PACKET; 222 packet_type = DISCARD_PACKET;
@@ -1562,7 +1562,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
1562 struct timeval timestamp; 1562 struct timeval timestamp;
1563 int n, ret, ret2; 1563 int n, ret, ret2;
1564 1564
1565 PDEBUG(D_FRAM, "read (%d)", count); 1565 PDEBUG(D_FRAM, "read (%zd)", count);
1566 if (!gspca_dev->present) 1566 if (!gspca_dev->present)
1567 return -ENODEV; 1567 return -ENODEV;
1568 switch (gspca_dev->memory) { 1568 switch (gspca_dev->memory) {
@@ -1613,7 +1613,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
1613 ret = copy_to_user(data, frame->data, count); 1613 ret = copy_to_user(data, frame->data, count);
1614 if (ret != 0) { 1614 if (ret != 0) {
1615 PDEBUG(D_ERR|D_STREAM, 1615 PDEBUG(D_ERR|D_STREAM,
1616 "read cp to user lack %d / %d", ret, count); 1616 "read cp to user lack %d / %zd", ret, count);
1617 ret = -EFAULT; 1617 ret = -EFAULT;
1618 goto out; 1618 goto out;
1619 } 1619 }