lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieee1394: csr1212: more sensible names for jump targets

Browse Source 
Code beneath two labels called "fail" is actually also reached in case
of success.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter
2007-03-14 00:28:36 +01:00
parent c94ccf9e33
commit 511f7b3227
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/ieee1394/csr1212.c
View File

@@ -1138,7 +1138,7 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
CSR1212_KV_VAL(ki)); CSR1212_KV_VAL(ki));
if (!k) { if (!k) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto out;
} }
k->refcnt = 0; /* Don't keep local reference when parsing. */ k->refcnt = 0; /* Don't keep local reference when parsing. */
@@ -1149,7 +1149,7 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
CSR1212_KV_VAL(ki)); CSR1212_KV_VAL(ki));
if (!k) { if (!k) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto out;
} }
k->refcnt = 0; /* Don't keep local reference when parsing. */ k->refcnt = 0; /* Don't keep local reference when parsing. */
break; break;
@@ -1162,7 +1162,7 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
* or Directories. The Config ROM image is most likely * or Directories. The Config ROM image is most likely
* messed up, so we'll just abort here. */ * messed up, so we'll just abort here. */
ret = -EIO; ret = -EIO;
goto fail; goto out;
} }
k = csr1212_find_keyval_offset(dir, offset); k = csr1212_find_keyval_offset(dir, offset);
@@ -1177,7 +1177,7 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
if (!k) { if (!k) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto out;
} }
k->refcnt = 0; /* Don't keep local reference when parsing. */ k->refcnt = 0; /* Don't keep local reference when parsing. */
k->valid = 0; /* Contents not read yet so it's not valid. */ k->valid = 0; /* Contents not read yet so it's not valid. */
@@ -1189,8 +1189,7 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
dir->next = k; dir->next = k;
} }
ret = csr1212_attach_keyval_to_directory(dir, k); ret = csr1212_attach_keyval_to_directory(dir, k);
out:
fail:
if (ret != CSR1212_SUCCESS && k != NULL) if (ret != CSR1212_SUCCESS && k != NULL)
free_keyval(k); free_keyval(k);
return ret; return ret;
@@ -1214,7 +1213,7 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv,
if ((csr1212_crc16(kvi->data, kvi_len) != kvi->crc) && if ((csr1212_crc16(kvi->data, kvi_len) != kvi->crc) &&
(csr1212_msft_crc16(kvi->data, kvi_len) != kvi->crc)) { (csr1212_msft_crc16(kvi->data, kvi_len) != kvi->crc)) {
ret = -EINVAL; ret = -EINVAL;
goto fail; goto out;
} }
#endif #endif
@@ -1241,7 +1240,7 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv,
kv->value.leaf.data = CSR1212_MALLOC(size); kv->value.leaf.data = CSR1212_MALLOC(size);
if (!kv->value.leaf.data) { if (!kv->value.leaf.data) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto out;
} }
kv->value.leaf.len = kvi_len; kv->value.leaf.len = kvi_len;
@@ -1251,8 +1250,7 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv,
} }
kv->valid = 1; kv->valid = 1;
out:
fail:
return ret; return ret;
} }