---

yaml --- r: 131726 b: refs/heads/master c: 9c939e4 h: refs/heads/master v: v3
git-mirror · Feb 24, 2009 · 43668b4 · 43668b4
1 parent f4d905d
commit 43668b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b33fdd6ca576d6c476c6aebf350d4556294d74ac
+refs/heads/master: 9c939e4df432fe4ed17bdbf7bc14111ec51ef7c9
diff --git a/trunk/drivers/ieee1394/nodemgr.c b/trunk/drivers/ieee1394/nodemgr.c
@@ -971,6 +971,9 @@ static struct unit_directory *nodemgr_process_unit_directory
 	ud->ud_kv = ud_kv;
 	ud->id = (*id)++;
 
+	/* inherit vendor_id from root directory if none exists in unit dir */
+	ud->vendor_id = ne->vendor_id;
+
 	csr1212_for_each_dir_entry(ne->csr, kv, ud_kv, dentry) {
 		switch (kv->key.id) {
 		case CSR1212_KV_ID_VENDOR: