aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/pac207.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-06-30 18:47:33 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:14:55 -0400
commit50a871fed9c82f01baa40100cd2d262784220953 (patch)
tree8bc1ba94cd7c479cd553a68237442f57da6245c3 /drivers/media/video/gspca/pac207.c
parent6a7eba24e4f0ff725d33159f6265e3a79d53a833 (diff)
V4L/DVB (8158): gspca: minor changes
main: V4L2_PIX_FMT_SPCA501 is compressed (thanks to Hans de Goede) main: return 0 when no change on vidioc_s_fmt_cap (thanks to Hans de Goede) pac207: cleanup 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/pac207.c')
-rw-r--r--drivers/media/video/gspca/pac207.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 72a5b89cd59d..008954e755f1 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -492,7 +492,7 @@ static void pac207_do_auto_gain(struct gspca_dev *gspca_dev)
492} 492}
493 493
494static unsigned char *pac207_find_sof(struct gspca_dev *gspca_dev, 494static unsigned char *pac207_find_sof(struct gspca_dev *gspca_dev,
495 unsigned char *m, int len) 495 unsigned char *m, int len)
496{ 496{
497 struct sd *sd = (struct sd *) gspca_dev; 497 struct sd *sd = (struct sd *) gspca_dev;
498 int i; 498 int i;
@@ -518,7 +518,9 @@ static unsigned char *pac207_find_sof(struct gspca_dev *gspca_dev,
518} 518}
519 519
520static int pac207_decompress_row(struct gspca_dev *gspca_dev, 520static int pac207_decompress_row(struct gspca_dev *gspca_dev,
521 struct gspca_frame *f, unsigned char *cdata, int len) 521 struct gspca_frame *f,
522 __u8 *cdata,
523 int len)
522{ 524{
523 struct sd *sd = (struct sd *) gspca_dev; 525 struct sd *sd = (struct sd *) gspca_dev;
524 struct pac207_decoder_state *decoder_state = &sd->decoder_state; 526 struct pac207_decoder_state *decoder_state = &sd->decoder_state;
@@ -667,10 +669,10 @@ static int pac207_decode_frame_data(struct gspca_dev *gspca_dev,
667 case LINE_HEADER2: 669 case LINE_HEADER2:
668 decoder_state->line_marker |= data[0]; 670 decoder_state->line_marker |= data[0];
669 switch (decoder_state->line_marker) { 671 switch (decoder_state->line_marker) {
670 case 0x0FF0: 672 case 0x0ff0:
671 decoder_state->line_state = LINE_UNCOMPRESSED; 673 decoder_state->line_state = LINE_UNCOMPRESSED;
672 break; 674 break;
673 case 0x1EE1: 675 case 0x1ee1:
674 decoder_state->line_state = LINE_COMPRESSED; 676 decoder_state->line_state = LINE_COMPRESSED;
675 break; 677 break;
676 default: 678 default: