diff options
Diffstat (limited to 'drivers/media/video/zr36060.c')
-rw-r--r-- | drivers/media/video/zr36060.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c index d8dd003a7aad..97c8f9b9dc12 100644 --- a/drivers/media/video/zr36060.c +++ b/drivers/media/video/zr36060.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/types.h> | 34 | #include <linux/types.h> |
35 | #include <linux/wait.h> | 35 | #include <linux/wait.h> |
36 | 36 | ||
37 | /* includes for structures and defines regarding video | 37 | /* includes for structures and defines regarding video |
38 | #include<linux/videodev.h> */ | 38 | #include<linux/videodev.h> */ |
39 | 39 | ||
40 | /* I/O commands, error codes */ | 40 | /* I/O commands, error codes */ |
@@ -173,7 +173,7 @@ zr36060_wait_end (struct zr36060 *ptr) | |||
173 | /* ========================================================================= | 173 | /* ========================================================================= |
174 | Local helper function: | 174 | Local helper function: |
175 | 175 | ||
176 | basic test of "connectivity", writes/reads to/from memory the SOF marker | 176 | basic test of "connectivity", writes/reads to/from memory the SOF marker |
177 | ========================================================================= */ | 177 | ========================================================================= */ |
178 | 178 | ||
179 | static int | 179 | static int |
@@ -208,9 +208,9 @@ zr36060_basic_test (struct zr36060 *ptr) | |||
208 | 208 | ||
209 | static int | 209 | static int |
210 | zr36060_pushit (struct zr36060 *ptr, | 210 | zr36060_pushit (struct zr36060 *ptr, |
211 | u16 startreg, | 211 | u16 startreg, |
212 | u16 len, | 212 | u16 len, |
213 | const char *data) | 213 | const char *data) |
214 | { | 214 | { |
215 | int i = 0; | 215 | int i = 0; |
216 | 216 | ||
@@ -335,7 +335,7 @@ static const char zr36060_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 }; | |||
335 | /* ------------------------------------------------------------------------- */ | 335 | /* ------------------------------------------------------------------------- */ |
336 | 336 | ||
337 | /* SOF (start of frame) segment depends on width, height and sampling ratio | 337 | /* SOF (start of frame) segment depends on width, height and sampling ratio |
338 | of each color component */ | 338 | of each color component */ |
339 | 339 | ||
340 | static int | 340 | static int |
341 | zr36060_set_sof (struct zr36060 *ptr) | 341 | zr36060_set_sof (struct zr36060 *ptr) |
@@ -367,8 +367,8 @@ zr36060_set_sof (struct zr36060 *ptr) | |||
367 | 367 | ||
368 | /* ------------------------------------------------------------------------- */ | 368 | /* ------------------------------------------------------------------------- */ |
369 | 369 | ||
370 | /* SOS (start of scan) segment depends on the used scan components | 370 | /* SOS (start of scan) segment depends on the used scan components |
371 | of each color component */ | 371 | of each color component */ |
372 | 372 | ||
373 | static int | 373 | static int |
374 | zr36060_set_sos (struct zr36060 *ptr) | 374 | zr36060_set_sos (struct zr36060 *ptr) |
@@ -385,7 +385,7 @@ zr36060_set_sos (struct zr36060 *ptr) | |||
385 | for (i = 0; i < NO_OF_COMPONENTS; i++) { | 385 | for (i = 0; i < NO_OF_COMPONENTS; i++) { |
386 | sos_data[5 + (i * 2)] = i; // index | 386 | sos_data[5 + (i * 2)] = i; // index |
387 | sos_data[6 + (i * 2)] = (zr36060_td[i] << 4) | | 387 | sos_data[6 + (i * 2)] = (zr36060_td[i] << 4) | |
388 | zr36060_ta[i]; // AC/DC tbl.sel. | 388 | zr36060_ta[i]; // AC/DC tbl.sel. |
389 | } | 389 | } |
390 | sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 2] = 00; // scan start | 390 | sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 2] = 00; // scan start |
391 | sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 3] = 0x3f; | 391 | sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 3] = 0x3f; |
@@ -999,7 +999,7 @@ zr36060_cleanup_module (void) | |||
999 | dprintk(1, | 999 | dprintk(1, |
1000 | "zr36060: something's wrong - %d codecs left somehow.\n", | 1000 | "zr36060: something's wrong - %d codecs left somehow.\n", |
1001 | zr36060_codecs); | 1001 | zr36060_codecs); |
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | /* however, we can't just stay alive */ | 1004 | /* however, we can't just stay alive */ |
1005 | videocodec_unregister(&zr36060_codec); | 1005 | videocodec_unregister(&zr36060_codec); |