Commit 5ec6bff1 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman

mcb: Fix an error handling path in 'chameleon_parse_cells()'

If 'chameleon_get_bar()' fails, we will return 0, which mean success.
We should return the corresponding error code instead.

Remove the useless initialisation of 'ret' which was hiding the issue.
(if 'ret' is not set, gcc generates a warning ("warning: ‘ret’ may be used
uninitialized in this function"))
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent acf5e051
...@@ -182,7 +182,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, ...@@ -182,7 +182,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase,
int num_cells = 0; int num_cells = 0;
uint32_t dtype; uint32_t dtype;
int bar_count; int bar_count;
int ret = 0; int ret;
u32 hsize; u32 hsize;
hsize = sizeof(struct chameleon_fpga_header); hsize = sizeof(struct chameleon_fpga_header);
...@@ -210,8 +210,10 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, ...@@ -210,8 +210,10 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase,
header->filename); header->filename);
bar_count = chameleon_get_bar(&p, mapbase, &cb); bar_count = chameleon_get_bar(&p, mapbase, &cb);
if (bar_count < 0) if (bar_count < 0) {
ret = bar_count;
goto free_header; goto free_header;
}
for_each_chameleon_cell(dtype, p) { for_each_chameleon_cell(dtype, p) {
switch (dtype) { switch (dtype) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment