---

yaml --- r: 319237 b: refs/heads/master c: baedee1 h: refs/heads/master i: 319235: f8c8598 v: v3
git-mirror · Jun 30, 2012 · f0e5ec5 · f0e5ec5
1 parent 24d6d9e
commit f0e5ec5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e18907cc8a3cd6e09510632b753b8b6fefa1752a
+refs/heads/master: baedee177e6c553af455865718971d9a9c75e537
diff --git a/trunk/drivers/firewire/core-device.c b/trunk/drivers/firewire/core-device.c
@@ -398,6 +398,14 @@ static ssize_t guid_show(struct device *dev,
 	return ret;
 }
 
+static ssize_t is_local_show(struct device *dev,
+			     struct device_attribute *attr, char *buf)
+{
+	struct fw_device *device = fw_device(dev);
+
+	return sprintf(buf, "%u\n", device->is_local);
+}
+
 static int units_sprintf(char *buf, const u32 *directory)
 {
 	struct fw_csr_iterator ci;
@@ -447,6 +455,7 @@ static ssize_t units_show(struct device *dev,
 static struct device_attribute fw_device_attributes[] = {
 	__ATTR_RO(config_rom),
 	__ATTR_RO(guid),
+	__ATTR_RO(is_local),
 	__ATTR_RO(units),
 	__ATTR_NULL,
 };

diff --git a/trunk/include/linux/firewire.h b/trunk/include/linux/firewire.h
@@ -138,7 +138,7 @@ struct fw_card {
 struct fw_attribute_group {
 	struct attribute_group *groups[2];
 	struct attribute_group group;
-	struct attribute *attrs[12];
+	struct attribute *attrs[13];
 };
 
 enum fw_device_state {