diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 08:54:14 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-01 08:54:14 +0400 |
| commit | ac6a0cf6716bb46813d0161024c66c2af66e53d1 (patch) | |
| tree | c7f53b1a04c590032c022549f3186fb9b04f8358 /drivers/media/video/cx18/cx18-controls.c | |
| parent | e76a0136a3cf1859fbc07f122e42293d22229558 (diff) | |
| parent | ce3f7cb96e67d6518c7fc7b361a76409c3817d64 (diff) | |
| download | linux-ac6a0cf6716bb46813d0161024c66c2af66e53d1.tar.xz | |
Merge branch 'master' into sh/smp
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'drivers/media/video/cx18/cx18-controls.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-controls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c index 5136df198338..93f0dae01350 100644 --- a/drivers/media/video/cx18/cx18-controls.c +++ b/drivers/media/video/cx18/cx18-controls.c @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307 USA */ +#include <linux/kernel.h> #include "cx18-driver.h" #include "cx18-cards.h" @@ -317,7 +318,7 @@ int cx18_s_ext_ctrls(struct file *file, void *fh, struct v4l2_ext_controls *c) idx = p.audio_properties & 0x03; /* The audio clock of the digitizer must match the codec sample rate otherwise you get some very strange effects. */ - if (idx < sizeof(freqs)) + if (idx < ARRAY_SIZE(freqs)) cx18_call_all(cx, audio, s_clock_freq, freqs[idx]); return err; } |