aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/firewire/core-device.c9
-rw-r--r--include/linux/firewire.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index 4d460ef87161..7a05fd24d68b 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -398,6 +398,14 @@ static ssize_t guid_show(struct device *dev,
398 return ret; 398 return ret;
399} 399}
400 400
401static ssize_t is_local_show(struct device *dev,
402 struct device_attribute *attr, char *buf)
403{
404 struct fw_device *device = fw_device(dev);
405
406 return sprintf(buf, "%u\n", device->is_local);
407}
408
401static int units_sprintf(char *buf, const u32 *directory) 409static int units_sprintf(char *buf, const u32 *directory)
402{ 410{
403 struct fw_csr_iterator ci; 411 struct fw_csr_iterator ci;
@@ -447,6 +455,7 @@ static ssize_t units_show(struct device *dev,
447static struct device_attribute fw_device_attributes[] = { 455static struct device_attribute fw_device_attributes[] = {
448 __ATTR_RO(config_rom), 456 __ATTR_RO(config_rom),
449 __ATTR_RO(guid), 457 __ATTR_RO(guid),
458 __ATTR_RO(is_local),
450 __ATTR_RO(units), 459 __ATTR_RO(units),
451 __ATTR_NULL, 460 __ATTR_NULL,
452}; 461};
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index d77f60c6d1ed..cb2445e2e10e 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -138,7 +138,7 @@ struct fw_card {
138struct fw_attribute_group { 138struct fw_attribute_group {
139 struct attribute_group *groups[2]; 139 struct attribute_group *groups[2];
140 struct attribute_group group; 140 struct attribute_group group;
141 struct attribute *attrs[12]; 141 struct attribute *attrs[13];
142}; 142};
143 143
144enum fw_device_state { 144enum fw_device_state {