diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-18 13:00:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-18 13:00:56 -0300 |
| commit | 85cb8b761dd5b3347aaa0fb22882bbd08525d860 (patch) | |
| tree | 9e9e92e4663a7c5be6a2c1d67c4b7119d7145a61 | |
| parent | 0c023f377be69bb35de1be41cebf647704ac9f94 (diff) | |
| parent | 8a8868a0bc72b42675b6bac8654c74823a612f90 (diff) | |
| download | mediapointer-dvb-s2-85cb8b761dd5b3347aaa0fb22882bbd08525d860.tar.gz mediapointer-dvb-s2-85cb8b761dd5b3347aaa0fb22882bbd08525d860.tar.bz2 | |
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/sn9c102/sn9c102_core.c | 2 | ||||
| -rw-r--r-- | v4l/compat.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/sn9c102/sn9c102_core.c b/linux/drivers/media/video/sn9c102/sn9c102_core.c index dc8fd17b6..5740518b0 100644 --- a/linux/drivers/media/video/sn9c102/sn9c102_core.c +++ b/linux/drivers/media/video/sn9c102/sn9c102_core.c @@ -528,7 +528,7 @@ sn9c102_find_sof_header(struct sn9c102_device* cam, void* mem, size_t len) /* Search for the SOF marker (fixed part) in the header */ for (j = 0, b=cam->sof.bytesread; j+b < sizeof(marker); j++) { - if (unlikely(i+j) == len) + if (unlikely(i+j == len)) return NULL; if (*(m+i+j) == marker[cam->sof.bytesread]) { cam->sof.header[cam->sof.bytesread] = *(m+i+j); diff --git a/v4l/compat.h b/v4l/compat.h index 581262bdf..0352fcd39 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -20,7 +20,8 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) -# define set_freezable() +#define set_freezable() +#define cancel_delayed_work_sync cancel_rearming_delayed_work #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18) |