diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /drivers/media/dvb/b2c2/flexcop-i2c.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'drivers/media/dvb/b2c2/flexcop-i2c.c')
| -rw-r--r-- | drivers/media/dvb/b2c2/flexcop-i2c.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c index 55973eaf3711..43a112ec6d44 100644 --- a/drivers/media/dvb/b2c2/flexcop-i2c.c +++ b/drivers/media/dvb/b2c2/flexcop-i2c.c | |||
| @@ -221,12 +221,12 @@ int flexcop_i2c_init(struct flexcop_device *fc) | |||
| 221 | fc->fc_i2c_adap[1].port = FC_I2C_PORT_EEPROM; | 221 | fc->fc_i2c_adap[1].port = FC_I2C_PORT_EEPROM; |
| 222 | fc->fc_i2c_adap[2].port = FC_I2C_PORT_TUNER; | 222 | fc->fc_i2c_adap[2].port = FC_I2C_PORT_TUNER; |
| 223 | 223 | ||
| 224 | strncpy(fc->fc_i2c_adap[0].i2c_adap.name, | 224 | strlcpy(fc->fc_i2c_adap[0].i2c_adap.name, "B2C2 FlexCop I2C to demod", |
| 225 | "B2C2 FlexCop I2C to demod", I2C_NAME_SIZE); | 225 | sizeof(fc->fc_i2c_adap[0].i2c_adap.name)); |
| 226 | strncpy(fc->fc_i2c_adap[1].i2c_adap.name, | 226 | strlcpy(fc->fc_i2c_adap[1].i2c_adap.name, "B2C2 FlexCop I2C to eeprom", |
| 227 | "B2C2 FlexCop I2C to eeprom", I2C_NAME_SIZE); | 227 | sizeof(fc->fc_i2c_adap[1].i2c_adap.name)); |
| 228 | strncpy(fc->fc_i2c_adap[2].i2c_adap.name, | 228 | strlcpy(fc->fc_i2c_adap[2].i2c_adap.name, "B2C2 FlexCop I2C to tuner", |
| 229 | "B2C2 FlexCop I2C to tuner", I2C_NAME_SIZE); | 229 | sizeof(fc->fc_i2c_adap[2].i2c_adap.name)); |
| 230 | 230 | ||
| 231 | i2c_set_adapdata(&fc->fc_i2c_adap[0].i2c_adap, &fc->fc_i2c_adap[0]); | 231 | i2c_set_adapdata(&fc->fc_i2c_adap[0].i2c_adap, &fc->fc_i2c_adap[0]); |
| 232 | i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]); | 232 | i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]); |