Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 109562
b: refs/heads/master
c: 221e7db
h: refs/heads/master
v: v3
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Sep 3, 2008
1 parent fc7f544 commit 96b8dbf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 327c4abf74a4426676df6c359b2a3dea2a5d126e
refs/heads/master: 221e7dbe55fe515ff786142bac64b507fa9f26de
18 changes: 0 additions & 18 deletions trunk/drivers/media/video/gspca/pac7311.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ struct sd {
#define SENSOR_PAC7311 1

u8 sof_read;
u8 header_read;
u8 autogain_ignore_frames;

atomic_t avg_lum;
Expand Down Expand Up @@ -709,8 +708,6 @@ static const unsigned char pac7311_jpeg_header2[] = {
/* Include pac common sof detection functions */
#include "pac_common.h"

#define HEADER_LENGTH 2

/* this function is run at interrupt level */
static void sd_pkt_scan(struct gspca_dev *gspca_dev,
struct gspca_frame *frame, /* target */
Expand Down Expand Up @@ -784,22 +781,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, INTER_PACKET, frame, tmpbuf, 4);
gspca_frame_add(gspca_dev, INTER_PACKET, frame,
pac7311_jpeg_header2, sizeof(pac7311_jpeg_header2));

sd->header_read = 0;
}

if (sd->header_read < HEADER_LENGTH) {
/* skip the variable part of the sof header */
int needed = HEADER_LENGTH - sd->header_read;
if (len <= needed) {
sd->header_read += len;
return;
}
data += needed;
len -= needed;
sd->header_read = HEADER_LENGTH;
}

gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
}

Expand Down

0 comments on commit 96b8dbf

Please sign in to comment.