From f36345027115848c77993b89ac78aa3a387d7a13 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 30 Aug 2008 06:03:09 -0300 Subject: [PATCH] --- yaml --- r: 113881 b: refs/heads/master c: 187565c43a95bcf7798c58d518ddd765933d24da h: refs/heads/master i: 113879: 8a8aa5858da46f30cc2d8d1a826fb43f9857618e v: v3 --- [refs] | 2 +- trunk/drivers/media/video/bt856.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 09dc667b863b..55c8c90f9819 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e08caf0cb85c4f63ddaf72a67d95fba8528e04e +refs/heads/master: 187565c43a95bcf7798c58d518ddd765933d24da diff --git a/trunk/drivers/media/video/bt856.c b/trunk/drivers/media/video/bt856.c index 98ee2d8feb34..ab2ce4d7b5de 100644 --- a/trunk/drivers/media/video/bt856.c +++ b/trunk/drivers/media/video/bt856.c @@ -68,8 +68,8 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); /* ----------------------------------------------------------------------- */ -#define REG_OFFSET 0xDA -#define BT856_NR_REG 6 +#define BT856_REG_OFFSET 0xDA +#define BT856_NR_REG 6 struct bt856 { unsigned char reg[BT856_NR_REG]; @@ -89,7 +89,7 @@ bt856_write (struct i2c_client *client, { struct bt856 *encoder = i2c_get_clientdata(client); - encoder->reg[reg - REG_OFFSET] = value; + encoder->reg[reg - BT856_REG_OFFSET] = value; return i2c_smbus_write_byte_data(client, reg, value); } @@ -103,7 +103,7 @@ bt856_setbit (struct i2c_client *client, return bt856_write(client, reg, (encoder-> - reg[reg - REG_OFFSET] & ~(1 << bit)) | + reg[reg - BT856_REG_OFFSET] & ~(1 << bit)) | (value ? (1 << bit) : 0)); }