diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-08 17:19:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-08 17:19:23 -0400 |
| commit | ad552692a4489917fa4b71f9c6a91baae4aee799 (patch) | |
| tree | 26cd1c8a92f9c8f9a219961fe054adbf877e85f4 /drivers/media/video/cx25840 | |
| parent | 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 (diff) | |
| parent | 0851fb48486c044476b019029245cb9b348fca33 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/cx25840')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 4 |
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) | |||
| 104 | if (i2c_master_recv(client, buffer, 4) < 4) | 104 | if (i2c_master_recv(client, buffer, 4) < 4) |
| 105 | return 0; | 105 | return 0; |
| 106 | 106 | ||
| 107 | return (buffer[0] << 24) | (buffer[1] << 16) | | 107 | return (buffer[3] << 24) | (buffer[2] << 16) | |
| 108 | (buffer[2] << 8) | buffer[3]; | 108 | (buffer[1] << 8) | buffer[0]; |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned and_mask, | 111 | int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned and_mask, |