From e2c41060816160e5dbab381efc212afb052589f3 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 22 Oct 2011 04:57:54 -0300 Subject: [PATCH] --- yaml --- r: 285163 b: refs/heads/master c: c27e3050378ec0d96d964cbf18746a30ad00ab9f h: refs/heads/master i: 285161: 950a4f12b084035497f25d01f8fa1031b6093d30 285159: 1a026d753e62165a52efb6b82edbac2b4eeb8adb v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mt9p031.c | 5 ++--- trunk/drivers/media/video/mt9t001.c | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a8d148b62d96..71700cbf9135 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfb128ed0768320c2d0e43cf781c8eaa622876b6 +refs/heads/master: c27e3050378ec0d96d964cbf18746a30ad00ab9f diff --git a/trunk/drivers/media/video/mt9p031.c b/trunk/drivers/media/video/mt9p031.c index 73c068993f05..93c3ec7426e8 100644 --- a/trunk/drivers/media/video/mt9p031.c +++ b/trunk/drivers/media/video/mt9p031.c @@ -132,13 +132,12 @@ static struct mt9p031 *to_mt9p031(struct v4l2_subdev *sd) static int mt9p031_read(struct i2c_client *client, u8 reg) { - s32 data = i2c_smbus_read_word_data(client, reg); - return data < 0 ? data : be16_to_cpu(data); + return i2c_smbus_read_word_swapped(client, reg); } static int mt9p031_write(struct i2c_client *client, u8 reg, u16 data) { - return i2c_smbus_write_word_data(client, reg, cpu_to_be16(data)); + return i2c_smbus_write_word_swapped(client, reg, data); } static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, diff --git a/trunk/drivers/media/video/mt9t001.c b/trunk/drivers/media/video/mt9t001.c index 08074b8a2736..cd81d04a529e 100644 --- a/trunk/drivers/media/video/mt9t001.c +++ b/trunk/drivers/media/video/mt9t001.c @@ -133,13 +133,12 @@ static inline struct mt9t001 *to_mt9t001(struct v4l2_subdev *sd) static int mt9t001_read(struct i2c_client *client, u8 reg) { - s32 data = i2c_smbus_read_word_data(client, reg); - return data < 0 ? data : be16_to_cpu(data); + return i2c_smbus_read_word_swapped(client, reg); } static int mt9t001_write(struct i2c_client *client, u8 reg, u16 data) { - return i2c_smbus_write_word_data(client, reg, cpu_to_be16(data)); + return i2c_smbus_write_word_swapped(client, reg, data); } static int mt9t001_set_output_control(struct mt9t001 *mt9t001, u16 clear,