summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-12 02:10:06 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-12 02:10:06 -0200
commit5021ce47870d8ce6b8efe93938138795dcc16553 (patch)
tree1a21631be8d469ae591d7d997bd1f378287a526a /linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
parentd2fdf36ebdc0970621958a5b6a7df809ed103bf8 (diff)
parenta3c3f7456fd59e54b7c0333ca9bb32b8be70044e (diff)
downloadmediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.gz
mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 16461dd92..770f31e60 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -637,10 +637,10 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
class_dev->class = &class_ptr->class;
if (pvr2_hdw_get_sn(sfp->channel.hdw)) {
- snprintf(class_dev->bus_id, BUS_ID_SIZE, "sn-%lu",
+ dev_set_name(class_dev, "sn-%lu",
pvr2_hdw_get_sn(sfp->channel.hdw));
} else if (pvr2_hdw_get_unit_number(sfp->channel.hdw) >= 0) {
- snprintf(class_dev->bus_id, BUS_ID_SIZE, "unit-%c",
+ dev_set_name(class_dev, "unit-%c",
pvr2_hdw_get_unit_number(sfp->channel.hdw) + 'a');
} else {
kfree(class_dev);