diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:23:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:23:20 -0800 |
| commit | 88f07ffb63add018bfafd480ec6a294088277f06 (patch) | |
| tree | 64b657d06b3ae7de3f87544a85d83d0ed6a7e3a9 /drivers/media/video/bt856.c | |
| parent | b6585dedac232ca79fe978d97a95fdaa6da24f66 (diff) | |
| parent | 9aa45e34d2948f360f8c0e63d10f49015ca51edd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (3568k): zoran: Use i2c_master_send when possible
V4L/DVB (3568j): adv7175: Drop unused encoder dump command
V4L/DVB (3568i): adv7175: Drop unused register cache
V4L/DVB (3568h): cpia: correct email address
V4L/DVB (3568g): sem2mutex: zoran
V4L/DVB (3568f): saa7110: Fix array overrun
V4L/DVB (3568e): bt856: Spare memory
V4L/DVB (3568d): saa7111.c fix
V4L/DVB (3568c): zoran: Init cleanups
V4L/DVB (3568b): saa7111: Prevent array overrun
V4L/DVB (3568a): saa7114: Fix i2c block write
Diffstat (limited to 'drivers/media/video/bt856.c')
| -rw-r--r-- | drivers/media/video/bt856.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index da3be00ae2f..4d47a0a0e97 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c @@ -70,17 +70,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); /* ----------------------------------------------------------------------- */ -#define REG_OFFSET 0xCE +#define REG_OFFSET 0xDA +#define BT856_NR_REG 6 struct bt856 { - unsigned char reg[32]; + unsigned char reg[BT856_NR_REG]; int norm; int enable; - int bright; - int contrast; - int hue; - int sat; }; #define I2C_BT856 0x88 @@ -119,8 +116,8 @@ bt856_dump (struct i2c_client *client) struct bt856 *encoder = i2c_get_clientdata(client); printk(KERN_INFO "%s: register dump:", I2C_NAME(client)); - for (i = 0xd6; i <= 0xde; i += 2) - printk(" %02x", encoder->reg[i - REG_OFFSET]); + for (i = 0; i < BT856_NR_REG; i += 2) + printk(" %02x", encoder->reg[i]); printk("\n"); } |