Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

of: Fix issue where code would fall through to error case.

No longer fall through into the error case that prints out
an error if no error (err = 0) occurred.

Fixes d9181b20a83(of: Add back an error message, restructured)
Signed-off-by: Moritz Fischer <mdf@kernel.org>
Reviewed-by: Frank Rowand <frank.rowand@am.sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>

authored by

Moritz Fischer and committed by
Rob Herring
32bed310 4aa66344

+8 -8
+8 -8
drivers/of/resolver.c
··· 298 298 if (!overlay) { 299 299 pr_err("null overlay\n"); 300 300 err = -EINVAL; 301 - goto err_out; 301 + goto out; 302 302 } 303 303 if (!of_node_check_flag(overlay, OF_DETACHED)) { 304 304 pr_err("overlay not detached\n"); 305 305 err = -EINVAL; 306 - goto err_out; 306 + goto out; 307 307 } 308 308 309 309 phandle_delta = live_tree_max_phandle() + 1; ··· 315 315 316 316 err = adjust_local_phandle_references(local_fixups, overlay, phandle_delta); 317 317 if (err) 318 - goto err_out; 318 + goto out; 319 319 320 320 overlay_fixups = NULL; 321 321 ··· 333 333 if (!tree_symbols) { 334 334 pr_err("no symbols in root of device tree.\n"); 335 335 err = -EINVAL; 336 - goto err_out; 336 + goto out; 337 337 } 338 338 339 339 for_each_property_of_node(overlay_fixups, prop) { ··· 345 345 err = of_property_read_string(tree_symbols, 346 346 prop->name, &refpath); 347 347 if (err) 348 - goto err_out; 348 + goto out; 349 349 350 350 refnode = of_find_node_by_path(refpath); 351 351 if (!refnode) { 352 352 err = -ENOENT; 353 - goto err_out; 353 + goto out; 354 354 } 355 355 356 356 phandle = refnode->phandle; ··· 361 361 break; 362 362 } 363 363 364 - err_out: 365 - pr_err("overlay phandle fixup failed: %d\n", err); 366 364 out: 365 + if (err) 366 + pr_err("overlay phandle fixup failed: %d\n", err); 367 367 of_node_put(tree_symbols); 368 368 369 369 return err;