Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9324547235f63b7ebc905feb606291fce5d85ef5
Commit:     9324547235f63b7ebc905feb606291fce5d85ef5
Parent:     d4c60085a97549ad3bb648e0652b9b48b7e42fa8
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 30 19:19:55 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Mon Apr 30 00:00:29 2007 +0200

    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 <[EMAIL PROTECTED]>
---
 drivers/ieee1394/nodemgr.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index ddd7aac..9e24045 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to