]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
csr1212: check results of keyval reads
authorJody McIntyre <scjody@steamballoon.com>
Tue, 22 Nov 2005 17:17:11 +0000 (12:17 -0500)
committerJody McIntyre <scjody@modernduck.com>
Tue, 22 Nov 2005 17:17:11 +0000 (12:17 -0500)
csr1212_parse_csr() did not properly check return values when reading
keyvals.  Fix this by using _csr1212_read_keyval() instead of
csr1212_get_keyval() and checking the return code.

Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
drivers/ieee1394/csr1212.c

index c0f8ed6fca8a02b724d31eabd6303ba7d64ea203..4812d59e8976289946f7e8feaa6b01c1f31bb963 100644 (file)
@@ -1610,15 +1610,16 @@ int csr1212_parse_csr(struct csr1212_csr *csr)
        csr->root_kv->valid = 0;
        csr->root_kv->next = csr->root_kv;
        csr->root_kv->prev = csr->root_kv;
-       csr1212_get_keyval(csr, csr->root_kv);
+       ret = _csr1212_read_keyval(csr, csr->root_kv);
+       if (ret != CSR1212_SUCCESS)
+               return ret;
 
        /* Scan through the Root directory finding all extended ROM regions
         * 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) {
-                       csr1212_get_keyval(csr, dentry->kv);
-
+                       ret = _csr1212_read_keyval(csr, dentry->kv);
                        if (ret != CSR1212_SUCCESS)
                                return ret;
                }