diff options
| author | Jody McIntyre <scjdy@steamballoon.com> | 2005-11-22 12:17:14 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-22 12:17:14 -0500 |
| commit | a96074e76f87a4f658af4ecfd95edc89cfd61fc1 (patch) | |
| tree | 5c791716a5b8533f25025fbd019d72b9f4e9907f /drivers/ieee1394/csr1212.c | |
| parent | 5303a986c33ae6c75d5ffb57d06ccf9246a8725a (diff) | |
| download | linux-3.10-a96074e76f87a4f658af4ecfd95edc89cfd61fc1.tar.gz linux-3.10-a96074e76f87a4f658af4ecfd95edc89cfd61fc1.tar.bz2 linux-3.10-a96074e76f87a4f658af4ecfd95edc89cfd61fc1.zip | |
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>
Diffstat (limited to 'drivers/ieee1394/csr1212.c')
| -rw-r--r-- | drivers/ieee1394/csr1212.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c index 4812d59e897..15773544234 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; |