From: Jody McIntyre <scjdy@steamballoon.com>
Date: Tue, 22 Nov 2005 17:17:14 +0000 (-0500)
Subject: csr1212: add check for !valid
X-Git-Tag: v2.6.16-rc1~474^2~45
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a96074e76f87a4f658af4ecfd95edc89cfd61fc1;p=linux-2.6

csr1212: add check for !valid

Don't read the keyval if there's already a valid one in place.  May not be
necessary but shouldn't hurt.

Signed-off-by: Jody McIntyre <scjdy@steamballoon.com>
---

diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 4812d59e89..1577354423 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/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;