Commit 187565c4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8850): bt856: fix define conflict 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4e08caf0

drivers/media/video/bt856.c

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); 


/* ----------------------------------------------------------------------- */



#define REG_OFFSET	0xDA

#define BT856_REG_OFFSET	0xDA

#define BT856_NR_REG		6



struct bt856 {
@@ -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));

}