From: Stefan Richter Date: Fri, 30 Mar 2007 17:19:55 +0000 (+0200) Subject: ieee1394: nodemgr: less noise in dmesg X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9324547235f63b7ebc905feb606291fce5d85ef5;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 --- diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index ddd7aac1e90..9e240450568 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