summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/stk014.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-12-02 10:59:54 +0100
committerJean-Francois Moine <moinejf@free.fr>2008-12-02 10:59:54 +0100
commita6c9884ef27fe6f0ac152b686bfb59ff9d112f54 (patch)
tree544f99243995d28fad322920537ab5f7446a3bb5 /linux/drivers/media/video/gspca/stk014.c
parentfd418b6a655b77600b58eca51b4e373e03bf6e26 (diff)
parent18a1649ef4ce188d4f62e37be85055bdfa5d6c97 (diff)
downloadmediapointer-dvb-s2-a6c9884ef27fe6f0ac152b686bfb59ff9d112f54.tar.gz
mediapointer-dvb-s2-a6c9884ef27fe6f0ac152b686bfb59ff9d112f54.tar.bz2
gspca: merge v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/stk014.c')
-rw-r--r--linux/drivers/media/video/gspca/stk014.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/video/gspca/stk014.c b/linux/drivers/media/video/gspca/stk014.c
index d9d64911f..74f57db53 100644
--- a/linux/drivers/media/video/gspca/stk014.c
+++ b/linux/drivers/media/video/gspca/stk014.c
@@ -424,10 +424,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
/* beginning of the frame */
#define STKHDRSZ 12
- gspca_frame_add(gspca_dev, INTER_PACKET, frame,
- data + STKHDRSZ, len - STKHDRSZ);
-#undef STKHDRSZ
- return;
+ data += STKHDRSZ;
+ len -= STKHDRSZ;
}
gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
}