diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-12 11:34:38 +0200 |
---|---|---|
committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-12 11:34:38 +0200 |
commit | 5d9abf072da54a382d318a6a23bc4d65d1c9f6a7 (patch) | |
tree | 0091520c14854a60961fc21d8942a1cf32ffa56b /linux/drivers/media/video/gspca | |
parent | 0b44aa87bd1a08f0c6c64872413937415f5cc7e9 (diff) | |
parent | 5d6597046c8d57aa650a06343c4d63ba7dbe57dc (diff) | |
download | mediapointer-dvb-s2-5d9abf072da54a382d318a6a23bc4d65d1c9f6a7.tar.gz mediapointer-dvb-s2-5d9abf072da54a382d318a6a23bc4d65d1c9f6a7.tar.bz2 |
merge: from v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca')
-rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index eb7abbaa8..cb07f2b2e 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -219,7 +219,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, if (len > 0) { if (frame->data_end - frame->data + len > frame->v4l2_buf.length) { - PDEBUG(D_ERR|D_PACK, "frame overflow %d > %d", + PDEBUG(D_ERR|D_PACK, "frame overflow %zd > %d", frame->data_end - frame->data + len, frame->v4l2_buf.length); packet_type = DISCARD_PACKET; @@ -1567,7 +1567,7 @@ static ssize_t dev_read(struct file *file, char __user *data, struct timeval timestamp; int n, ret, ret2; - PDEBUG(D_FRAM, "read (%d)", count); + PDEBUG(D_FRAM, "read (%zd)", count); if (!gspca_dev->present) return -ENODEV; switch (gspca_dev->memory) { @@ -1618,7 +1618,7 @@ static ssize_t dev_read(struct file *file, char __user *data, ret = copy_to_user(data, frame->data, count); if (ret != 0) { PDEBUG(D_ERR|D_STREAM, - "read cp to user lack %d / %d", ret, count); + "read cp to user lack %d / %zd", ret, count); ret = -EFAULT; goto out; } |