Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/mcb/mcb-parse.c

+4 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, 
	int num_cells = 0;

	uint32_t dtype;

	int bar_count;

	int ret = 0;

	int ret;

	u32 hsize;



	hsize = sizeof(struct chameleon_fpga_header);
@@ -210,8 +210,10 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, 
		 header->filename);



	bar_count = chameleon_get_bar(&p, mapbase, &cb);

	if (bar_count < 0)

	if (bar_count < 0) {

		ret = bar_count;

		goto free_header;

	}



	for_each_chameleon_cell(dtype, p) {

		switch (dtype) {