From ec1042b6d8d1e1de616dff29170feb06dd66669b Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Wed, 14 Jan 2009 04:24:20 -0300 Subject: [PATCH] --- yaml --- r: 137697 b: refs/heads/master c: 730e92c9acfab4f577c65c112a6d14ad9d3d02ba h: refs/heads/master i: 137695: 447f0a4bafac89361a0d56041e9e15f0e693a612 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e2648ebc6684..625a7bb41a48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13a887971b6c97751fce62ab803ee93a42a23c5d +refs/heads/master: 730e92c9acfab4f577c65c112a6d14ad9d3d02ba diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c index e641cd971453..e20ba1e6e0ea 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c @@ -627,16 +627,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;