From 43668b4c9612b0e258a78c3b64eca4390b3c21f2 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Wed, 27 Aug 2008 01:24:25 +0200
Subject: [PATCH] --- yaml --- r: 131726 b: refs/heads/master c:
 9c939e4df432fe4ed17bdbf7bc14111ec51ef7c9 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ieee1394/nodemgr.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7f5bb36fb841..4eed28af1afd 100644
--- 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
index f47b6f69d2a9..53aada5bbe1e 100644
--- 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: