diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:00:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:00:52 -0300 |
| commit | 70bbc9f369222fa300c1fcb727eefd22da4db452 (patch) | |
| tree | 5ce7c5a87a1a88ac671c475fffa52d6cd2b4b4fe /linux/drivers/media/dvb | |
| parent | 72323c965e7e5472d7e8bc29775b1205cad63c78 (diff) | |
| parent | 2c783d535370caf906c325483998a842b5e0920a (diff) | |
| download | mediapointer-dvb-s2-70bbc9f369222fa300c1fcb727eefd22da4db452.tar.gz mediapointer-dvb-s2-70bbc9f369222fa300c1fcb727eefd22da4db452.tar.bz2 | |
merge: http://udev.netup.ru/hg/v4l-dvb-netup
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c index c4b8b0677..08c63014c 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -815,7 +815,7 @@ static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub) mutex_init(&card->lock); card->bttv_nr = sub->core->nr; - strncpy(card->card_name, sub->core->name, sizeof(sub->core->name)); + strlcpy(card->card_name, sub->core->v4l2_dev.name, sizeof(card->card_name)); card->i2c_adapter = &sub->core->i2c_adap; switch(sub->core->type) { |