summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mt9m001.c
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-10-21 09:30:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-07 10:39:29 -0200
commit3f8770454b82c166662201a8966476f4538cbfeb (patch)
tree4092eed169d90ef91790936fa58629e8738a2bab /drivers/media/video/mt9m001.c
parent8f4ffb1d4752ebce153e88266ac1164e8ecc5854 (diff)
downloadlinux-3f8770454b82c166662201a8966476f4538cbfeb.tar.gz
linux-3f8770454b82c166662201a8966476f4538cbfeb.tar.bz2
linux-3f8770454b82c166662201a8966476f4538cbfeb.zip
[media] v4l: use i2c_smbus_read_word_swapped
Function ensures that error codes don't get mangled. Dependant on: which is working it's way through the i2c tree. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Jean Delvare <khali@linux-fr.org> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mt9m001.c')
-rw-r--r--drivers/media/video/mt9m001.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 63ae5c61c9bf..9f3ffc7bf9d2 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -108,14 +108,13 @@ static struct mt9m001 *to_mt9m001(const struct i2c_client *client)
static int reg_read(struct i2c_client *client, const u8 reg)
{
- s32 data = i2c_smbus_read_word_data(client, reg);
- return data < 0 ? data : swab16(data);
+ return i2c_smbus_read_word_swapped(client, reg);
}
static int reg_write(struct i2c_client *client, const u8 reg,
const u16 data)
{
- return i2c_smbus_write_word_data(client, reg, swab16(data));
+ return i2c_smbus_write_word_swapped(client, reg, data);
}
static int reg_set(struct i2c_client *client, const u8 reg,