From fb11196f1e0240227ea2aaa46526902642fe76a3 Mon Sep 17 00:00:00 2001
From: Jody McIntyre <scjdy@steamballoon.com>
Date: Tue, 22 Nov 2005 12:17:14 -0500
Subject: [PATCH] --- yaml --- r: 15399 b: refs/heads/master c:
 a96074e76f87a4f658af4ecfd95edc89cfd61fc1 h: refs/heads/master i:   15397:
 9801d8e7ee6524cd1661cc6eb06955f0a4b82b9f   15395:
 2c4a57f1d4ea13163024705ce3e0cd838ed0b416   15391:
 66089a5e5804631d2228c231d117b16e0bdcd8fc v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ieee1394/csr1212.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 51f2c91e7824..ad77537121f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5303a986c33ae6c75d5ffb57d06ccf9246a8725a
+refs/heads/master: a96074e76f87a4f658af4ecfd95edc89cfd61fc1
diff --git a/trunk/drivers/ieee1394/csr1212.c b/trunk/drivers/ieee1394/csr1212.c
index 4812d59e8976..15773544234b 100644
--- a/trunk/drivers/ieee1394/csr1212.c
+++ b/trunk/drivers/ieee1394/csr1212.c
@@ -1618,7 +1618,8 @@ int csr1212_parse_csr(struct csr1212_csr *csr)
 	 * and make cache regions for them */
 	for (dentry = csr->root_kv->value.directory.dentries_head;
 	     dentry; dentry = dentry->next) {
-		if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM) {
+		if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM &&
+			!dentry->kv->valid) {
 			ret = _csr1212_read_keyval(csr, dentry->kv);
 			if (ret != CSR1212_SUCCESS)
 				return ret;