summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-08-08 09:10:12 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-08 15:53:03 -0300
commit17531c168c7b8138b5379a85de788798fc6696e1 (patch)
treef0ca8541a78786c01c90fefe58a11c9dc8ca5504 /drivers/media/video
parentb02dc515914bc37f5e406cc6f622fc06991eb779 (diff)
downloadblackbird-op-linux-17531c168c7b8138b5379a85de788798fc6696e1.tar.gz
blackbird-op-linux-17531c168c7b8138b5379a85de788798fc6696e1.zip
V4L/DVB (4416): Cx25840_read4 has wrong endianness.
cx25840_read4 assembled the bytes in the wrong order. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 5c2036b40ea1..7bb7589a07c3 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -104,8 +104,8 @@ u32 cx25840_read4(struct i2c_client * client, u16 addr)
if (i2c_master_recv(client, buffer, 4) < 4)
return 0;
- return (buffer[0] << 24) | (buffer[1] << 16) |
- (buffer[2] << 8) | buffer[3];
+ return (buffer[3] << 24) | (buffer[2] << 16) |
+ (buffer[1] << 8) | buffer[0];
}
int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned and_mask,
OpenPOWER on IntegriCloud