diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:13:58 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:13:58 +0400 |
| commit | 6ef62164e794c480259ac158aa6c8c7b85746545 (patch) | |
| tree | c4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/media/dvb/frontends/cx24123.c | |
| parent | e75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | linux-6ef62164e794c480259ac158aa6c8c7b85746545.tar.xz | |
Merge commit 'v2.6.27-rc6' into timers/urgent
Diffstat (limited to 'drivers/media/dvb/frontends/cx24123.c')
| -rw-r--r-- | drivers/media/dvb/frontends/cx24123.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c index 7f68d78c6558..7156157cb34b 100644 --- a/drivers/media/dvb/frontends/cx24123.c +++ b/drivers/media/dvb/frontends/cx24123.c @@ -1,7 +1,7 @@ /* * Conexant cx24123/cx24109 - DVB QPSK Satellite demod/tuner driver * - * Copyright (C) 2005 Steven Toth <stoth@hauppauge.com> + * Copyright (C) 2005 Steven Toth <stoth@linuxtv.org> * * Support for KWorld DVB-S 100 by Vadim Catana <skystar@moldova.cc> * @@ -1072,8 +1072,8 @@ struct dvb_frontend* cx24123_attach(const struct cx24123_config* config, if (config->dont_use_pll) cx24123_repeater_mode(state, 1, 0); - strncpy(state->tuner_i2c_adapter.name, - "CX24123 tuner I2C bus", I2C_NAME_SIZE); + strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus", + sizeof(state->tuner_i2c_adapter.name)); state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo; state->tuner_i2c_adapter.algo_data = NULL; |