From e17f0e9f2226a61d2e54a1c5d5417802cac9a08c Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 8 Aug 2006 09:10:12 -0300 Subject: [PATCH] --- yaml --- r: 33279 b: refs/heads/master c: 17531c168c7b8138b5379a85de788798fc6696e1 h: refs/heads/master i: 33277: 6ba83f24b493098710e6616773f4c49f802bebee 33275: 773b11fb938661bd758c70935aa8d15bf69847c4 33271: 13c82f665af4a2f30624c5e66ca3790b127d7574 33263: ec595132014615bfa21188d353dd32bd7620ca64 33247: ab5ba3cda2cebfe86047d8c3ee45a0a8a54efa79 33215: d8ddba9662e6bf823e752339b74964edd92c5668 33151: 018dfd931f6280da5e86115a6bef2d8c3b50e14b 33023: 7fd7f20713952a1b04c2da1f2f66ec8237a22930 32767: 5ae4f0356026b0363efef5eff8fdbdc7fb85add4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25840/cx25840-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e0363887ebda..017c434ee0eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b02dc515914bc37f5e406cc6f622fc06991eb779 +refs/heads/master: 17531c168c7b8138b5379a85de788798fc6696e1 diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c index 5c2036b40ea1..7bb7589a07c3 100644 --- a/trunk/drivers/media/video/cx25840/cx25840-core.c +++ b/trunk/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,