浏览代码

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>
Jody McIntyre 19 年之前
父节点
当前提交
a96074e76f
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/ieee1394/csr1212.c

+ 2 - 1
drivers/ieee1394/csr1212.c

@@ -1618,7 +1618,8 @@ int csr1212_parse_csr(struct csr1212_csr *csr)
 	 * and make cache regions for them */
 	 * and make cache regions for them */
 	for (dentry = csr->root_kv->value.directory.dentries_head;
 	for (dentry = csr->root_kv->value.directory.dentries_head;
 	     dentry; dentry = dentry->next) {
 	     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);
 			ret = _csr1212_read_keyval(csr, dentry->kv);
 			if (ret != CSR1212_SUCCESS)
 			if (ret != CSR1212_SUCCESS)
 				return ret;
 				return ret;