summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-30 21:19:55 +0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-04-30 02:00:29 +0400
commit9324547235f63b7ebc905feb606291fce5d85ef5 (patch)
treea0738df7f205f40f9724fac313c2f44530ac3f80 /drivers
parentd4c60085a97549ad3bb648e0652b9b48b7e42fa8 (diff)
downloadlinux-9324547235f63b7ebc905feb606291fce5d85ef5.tar.xz
ieee1394: nodemgr: less noise in dmesg
Everytime when eth1394 or a libraw1394 client updates the configuration ROM, a certain sysfs attribute cannot be added since it already exists. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ieee1394/nodemgr.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index ddd7aac1e90f..9e2404505685 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1145,13 +1145,14 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
last_key_id = kv->key.id;
}
- if (ne->vendor_name_kv &&
- device_create_file(&ne->device, &dev_attr_ne_vendor_name_kv))
- goto fail;
- return;
-fail:
- HPSB_ERR("Failed to add sysfs attribute for node %016Lx",
- (unsigned long long)ne->guid);
+ if (ne->vendor_name_kv) {
+ int error = device_create_file(&ne->device,
+ &dev_attr_ne_vendor_name_kv);
+
+ if (error && error != -EEXIST)
+ HPSB_ERR("Failed to add sysfs attribute for node "
+ "%016Lx", (unsigned long long)ne->guid);
+ }
}
#ifdef CONFIG_HOTPLUG