diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:15:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:15:24 -0300 |
| commit | e916f4cd0bb1f1815fcb5b617fa59ac57b4e7eb5 (patch) | |
| tree | 2b27075dc737563fb0f86cbd1b7a79fa341fc6cc /linux/drivers/media/dvb | |
| parent | 2459bf3000c7be8c5b73d2495df998039f400b00 (diff) | |
| download | mediapointer-dvb-s2-e916f4cd0bb1f1815fcb5b617fa59ac57b4e7eb5.tar.gz mediapointer-dvb-s2-e916f4cd0bb1f1815fcb5b617fa59ac57b4e7eb5.tar.bz2 | |
Backport several i2c cleanups from mainstream
From: Mauro Carvalho Chehab <mchehab@infradead.org>
backport commit 2096b956d24c4b5950b808fc23b218425d79ebb1 from David
Brownell <david-b@pacbell.net>
Maybe I've merged also other i2c cleanups here that happened on Kernel.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-i2c.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/dibx000_common.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c index 5347a406f..02a0ea6e1 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c @@ -183,7 +183,8 @@ int flexcop_i2c_init(struct flexcop_device *fc) mutex_init(&fc->i2c_mutex); memset(&fc->i2c_adap, 0, sizeof(struct i2c_adapter)); - strncpy(fc->i2c_adap.name, "B2C2 FlexCop device",I2C_NAME_SIZE); + strncpy(fc->i2c_adap.name, "B2C2 FlexCop device", + sizeof(fc->i2c_adap.name)); i2c_set_adapdata(&fc->i2c_adap,fc); diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c index e4d67534a..4c80823d8 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c @@ -19,7 +19,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) return -EINVAL; } - strncpy(d->i2c_adap.name,d->desc->name,I2C_NAME_SIZE); + strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); #ifdef I2C_ADAP_CLASS_TV_DIGITAL d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL, #else diff --git a/linux/drivers/media/dvb/frontends/dibx000_common.c b/linux/drivers/media/dvb/frontends/dibx000_common.c index 1f6dc06a3..a8e3a950c 100644 --- a/linux/drivers/media/dvb/frontends/dibx000_common.c +++ b/linux/drivers/media/dvb/frontends/dibx000_common.c @@ -144,9 +144,9 @@ struct i2c_adapter * dibx000_get_i2c_adapter(struct dibx000_i2c_master *mst, enu } EXPORT_SYMBOL(dibx000_get_i2c_adapter); -static int i2c_adapter_init(struct i2c_adapter *i2c_adap, struct i2c_algorithm *algo, const char name[I2C_NAME_SIZE], struct dibx000_i2c_master *mst) +static int i2c_adapter_init(struct i2c_adapter *i2c_adap, struct i2c_algorithm *algo, const char *name, struct dibx000_i2c_master *mst) { - strncpy(i2c_adap->name, name, I2C_NAME_SIZE); + strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo; i2c_adap->algo_data = NULL; |