summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/zr364xx.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/linux/drivers/media/video/zr364xx.c b/linux/drivers/media/video/zr364xx.c
index 43643ce84..88b1fec85 100644
--- a/linux/drivers/media/video/zr364xx.c
+++ b/linux/drivers/media/video/zr364xx.c
@@ -282,7 +282,7 @@ static unsigned char header3;
static int read_frame(struct zr364xx_camera *cam, int framenum)
{
int i, n, temp, head, size, actual_length;
- unsigned char *ptr = NULL, *jpeg, swap;
+ unsigned char *ptr = NULL, *jpeg;
redo:
/* hardware brightness */
@@ -313,12 +313,11 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)
}
/* swap bytes if camera needs it */
- if (cam->method == METHOD0)
- for (i = 0; i < BUFFER_SIZE; i += 2) {
- swap = cam->buffer[i];
- cam->buffer[i] = cam->buffer[i + 1];
- cam->buffer[i + 1] = swap;
- }
+ if (cam->method == METHOD0) {
+ u16 *buf = (u16*)cam->buffer;
+ for (i = 0; i < BUFFER_SIZE/2; i++)
+ swab16s(buf + i);
+ }
/* write the JPEG header */
if (!head) {