diff options
| author | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
| commit | c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b (patch) | |
| tree | 4ad3708cf7dc5ff01b2e657e314883ab2330c658 /linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | |
| parent | 708ba0701edccea0b0fc2b0ea9303337a85ff05c (diff) | |
| parent | b0fc8c78cb5fd9394d8d4ff3198bdc9390b96001 (diff) | |
| download | mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.gz mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.bz2 | |
Merge from master v4l-dvb repo
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c index 770f31e60..84379d6e0 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c @@ -636,16 +636,8 @@ static void class_dev_create(struct pvr2_sysfs *sfp, pvr2_sysfs_trace("Creating class_dev id=%p",class_dev); class_dev->class = &class_ptr->class; - if (pvr2_hdw_get_sn(sfp->channel.hdw)) { - 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) { - dev_set_name(class_dev, "unit-%c", - pvr2_hdw_get_unit_number(sfp->channel.hdw) + 'a'); - } else { - kfree(class_dev); - return; - } + dev_set_name(class_dev, "%s", + pvr2_hdw_get_device_identifier(sfp->channel.hdw)); class_dev->parent = &usb_dev->dev; |