diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-14 11:36:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:23 -0400 |
commit | 74fc7bd9cec0ccdbea23659208492ec7ffc58297 (patch) | |
tree | cd16dbc46ec3771da456d71e2d0f27519ca9ae79 /drivers/media/dvb | |
parent | f1ba28c3a6e472742cbd73b05b807684e5d56b5a (diff) |
V4L/DVB (11046): bttv: convert to v4l2_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 48762a2b9e42..b1857c19bbd2 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c | |||
@@ -814,7 +814,7 @@ static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub) | |||
814 | 814 | ||
815 | mutex_init(&card->lock); | 815 | mutex_init(&card->lock); |
816 | card->bttv_nr = sub->core->nr; | 816 | card->bttv_nr = sub->core->nr; |
817 | strncpy(card->card_name, sub->core->name, sizeof(sub->core->name)); | 817 | strlcpy(card->card_name, sub->core->v4l2_dev.name, sizeof(card->card_name)); |
818 | card->i2c_adapter = &sub->core->i2c_adap; | 818 | card->i2c_adapter = &sub->core->i2c_adap; |
819 | 819 | ||
820 | switch(sub->core->type) { | 820 | switch(sub->core->type) { |