aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/spca500.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-01 09:03:42 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:15:56 -0400
commit956e42d28f300f5bb928fb5850b3e3c0a8982d23 (patch)
tree473a9832d684d88d630bf8dadb0a0934ad5eff48 /drivers/media/video/gspca/spca500.c
parent00528d9c2e9e15625883c161867cba61725ba335 (diff)
V4L/DVB (8180): Source cleanup - compile error with VIDEO_ADV_DEBUG.
main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505: Cleanup source. sunplus: Compilation error when VIDEO_ADV_DEBUG set. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/spca500.c')
-rw-r--r--drivers/media/video/gspca/spca500.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index c0dd969a3106..e72fca5744ac 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -336,7 +336,7 @@ static unsigned char qtable_kodak_ez200[2][64] = {
336}; 336};
337 337
338static unsigned char qtable_pocketdv[2][64] = { 338static unsigned char qtable_pocketdv[2][64] = {
339 { /* Q-table Y-components start registers 0x8800 */ 339 { /* Q-table Y-components start registers 0x8800 */
340 0x06, 0x04, 0x04, 0x06, 0x0a, 0x10, 0x14, 0x18, 340 0x06, 0x04, 0x04, 0x06, 0x0a, 0x10, 0x14, 0x18,
341 0x05, 0x05, 0x06, 0x08, 0x0a, 0x17, 0x18, 0x16, 341 0x05, 0x05, 0x06, 0x08, 0x0a, 0x17, 0x18, 0x16,
342 0x06, 0x05, 0x06, 0x0a, 0x10, 0x17, 0x1c, 0x16, 342 0x06, 0x05, 0x06, 0x0a, 0x10, 0x17, 0x1c, 0x16,
@@ -346,7 +346,7 @@ static unsigned char qtable_pocketdv[2][64] = {
346 0x14, 0x1a, 0x1f, 0x23, 0x29, 0x30, 0x30, 0x28, 346 0x14, 0x1a, 0x1f, 0x23, 0x29, 0x30, 0x30, 0x28,
347 0x1d, 0x25, 0x26, 0x27, 0x2d, 0x28, 0x29, 0x28, 347 0x1d, 0x25, 0x26, 0x27, 0x2d, 0x28, 0x29, 0x28,
348 }, 348 },
349 { /* Q-table C-components start registers 0x8840 */ 349 { /* Q-table C-components start registers 0x8840 */
350 0x07, 0x07, 0x0a, 0x13, 0x28, 0x28, 0x28, 0x28, 350 0x07, 0x07, 0x0a, 0x13, 0x28, 0x28, 0x28, 0x28,
351 0x07, 0x08, 0x0a, 0x1a, 0x28, 0x28, 0x28, 0x28, 351 0x07, 0x08, 0x0a, 0x1a, 0x28, 0x28, 0x28, 0x28,
352 0x0a, 0x0a, 0x16, 0x28, 0x28, 0x28, 0x28, 0x28, 352 0x0a, 0x0a, 0x16, 0x28, 0x28, 0x28, 0x28, 0x28,
@@ -833,7 +833,8 @@ static void sd_start(struct gspca_dev *gspca_dev)
833 * - NWG (Sat 29th March 2003) */ 833 * - NWG (Sat 29th March 2003) */
834 834
835 /* do a full reset */ 835 /* do a full reset */
836 if ((err = spca500_full_reset(gspca_dev)) < 0) 836 err = spca500_full_reset(gspca_dev);
837 if (err < 0)
837 PDEBUG(D_ERR, "spca500_full_reset failed"); 838 PDEBUG(D_ERR, "spca500_full_reset failed");
838 839
839 /* enable drop packet */ 840 /* enable drop packet */
@@ -918,7 +919,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
918 /* Init SDRAM - needed for SDRAM access */ 919 /* Init SDRAM - needed for SDRAM access */
919 reg_write(gspca_dev->dev, 0x00, 0x870a, 0x04); 920 reg_write(gspca_dev->dev, 0x00, 0x870a, 0x04);
920 921
921 spca500_setmode(gspca_dev,xmult,ymult); 922 spca500_setmode(gspca_dev, xmult, ymult);
922 /* switch to video camera mode */ 923 /* switch to video camera mode */
923 reg_write(gspca_dev->dev, 0x00, 0x8000, 0x0004); 924 reg_write(gspca_dev->dev, 0x00, 0x8000, 0x0004);
924 925