summaryrefslogtreecommitdiff
path: root/drivers/dahdi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dahdi')
-rw-r--r--drivers/dahdi/dahdi-sysfs.c11
-rw-r--r--drivers/dahdi/xpp/xbus-core.c2
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c
index 161a1d9..0523ed4 100644
--- a/drivers/dahdi/dahdi-sysfs.c
+++ b/drivers/dahdi/dahdi-sysfs.c
@@ -484,6 +484,16 @@ dahdi_device_location_show(struct device *dev,
}
static ssize_t
+dahdi_device_hardware_id_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct dahdi_device *ddev = to_ddev(dev);
+
+ return sprintf(buf, "%s\n",
+ (ddev->hardware_id) ? ddev->hardware_id : "");
+}
+
+static ssize_t
dahdi_device_auto_register(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
@@ -524,6 +534,7 @@ static struct device_attribute dahdi_device_attrs[] = {
__ATTR(type, S_IRUGO, dahdi_device_type_show, NULL),
__ATTR(span_count, S_IRUGO, dahdi_device_span_count_show, NULL),
__ATTR(location, S_IRUGO, dahdi_device_location_show, NULL),
+ __ATTR(hardware_id, S_IRUGO, dahdi_device_hardware_id_show, NULL),
__ATTR(auto_register, S_IWUSR, NULL, dahdi_device_auto_register),
__ATTR(register_span, S_IWUSR, NULL, dahdi_device_register_span),
__ATTR_NULL,
diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c
index b414200..9c77238 100644
--- a/drivers/dahdi/xpp/xbus-core.c
+++ b/drivers/dahdi/xpp/xbus-core.c
@@ -852,6 +852,7 @@ static int xbus_register_dahdi_device(xbus_t *xbus)
* So let's also export it via the newfangled "location" field.
*/
xbus->ddev->location = xbus->connector;
+ xbus->ddev->hardware_id = xbus->label;
/*
* Prepare the span list
@@ -885,6 +886,7 @@ static void xbus_unregister_dahdi_device(xbus_t *xbus)
kfree(xbus->ddev->devicetype);
xbus->ddev->devicetype = NULL;
xbus->ddev->location = NULL;
+ xbus->ddev->hardware_id = NULL;
dahdi_free_device(xbus->ddev);
xbus->ddev = NULL;
}