diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-09-03 16:12:23 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 17:37:50 -0400 |
commit | 1d434012f23effdc69d58a88229159b57256f6ba (patch) | |
tree | 8d713db39a3fcf60cf1a9316aba31cdf3e23e1d8 /drivers/media | |
parent | c437d657c59921b048997d5bc1f5733670112902 (diff) |
V4L/DVB (8837): dvb: fix I2C adapters name size
Some DVB drivers are incorrectly assuming that the size of
i2c_adapter.name is I2C_NAME_SIZE. Here's a fix.
Also change strncpy to strlcpy, as the former is error-prone (and was
indeed incorrectly used.)
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Uwe Bugla <uwe.bugla@gmx.de>
Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop-i2c.c | 12 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/cx24123.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/s5h1420.c | 3 |
3 files changed, 10 insertions, 9 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]); |
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c index 386bd7472b9c..7156157cb34b 100644 --- a/drivers/media/dvb/frontends/cx24123.c +++ b/drivers/media/dvb/frontends/cx24123.c | |||
@@ -1072,8 +1072,8 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config, | |||
1072 | if (config->dont_use_pll) | 1072 | if (config->dont_use_pll) |
1073 | cx24123_repeater_mode(state, 1, 0); | 1073 | cx24123_repeater_mode(state, 1, 0); |
1074 | 1074 | ||
1075 | strncpy(state->tuner_i2c_adapter.name, | 1075 | strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus", |
1076 | "CX24123 tuner I2C bus", I2C_NAME_SIZE); | 1076 | sizeof(state->tuner_i2c_adapter.name)); |
1077 | state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, | 1077 | state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, |
1078 | state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo; | 1078 | state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo; |
1079 | state->tuner_i2c_adapter.algo_data = NULL; | 1079 | state->tuner_i2c_adapter.algo_data = NULL; |
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c index 720ed9ff7c5f..747d3fa2e5e5 100644 --- a/drivers/media/dvb/frontends/s5h1420.c +++ b/drivers/media/dvb/frontends/s5h1420.c | |||
@@ -915,7 +915,8 @@ struct dvb_frontend *s5h1420_attach(const struct s5h1420_config *config, | |||
915 | state->frontend.demodulator_priv = state; | 915 | state->frontend.demodulator_priv = state; |
916 | 916 | ||
917 | /* create tuner i2c adapter */ | 917 | /* create tuner i2c adapter */ |
918 | strncpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", I2C_NAME_SIZE); | 918 | strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", |
919 | sizeof(state->tuner_i2c_adapter.name)); | ||
919 | state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, | 920 | state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, |
920 | state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo; | 921 | state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo; |
921 | state->tuner_i2c_adapter.algo_data = NULL; | 922 | state->tuner_i2c_adapter.algo_data = NULL; |