| Message ID | 20200126222054.388621-1-christoph.muellner@theobroma-systems.com |
|---|---|
| State | Accepted |
| Commit | 0f97e923d4921a057e1a7bbfac170cadefde5624 |
| Headers | show |
| Series | optee: Replace uninitialized return variable by proper one. | expand |
Am Sonntag, 26. Januar 2020, 23:20:54 CET schrieb Christoph Müllner: > As hinted by GCC 9, there is a return statement that returns > an uninitialized variable in optee_copy_firmware_node(). > This patch addresses this. > > Signed-off-by: Christoph Müllner <christoph.muellner at theobroma-systems.com> Thanks for catching this mistake of mine Reviewed-by: Heiko Stuebner <heiko.stuebner at theobroma-systems.com> > > --- > > lib/optee/optee.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/optee/optee.c b/lib/optee/optee.c > index 9b49eb8ee7..d4355c6d03 100644 > --- a/lib/optee/optee.c > +++ b/lib/optee/optee.c > @@ -92,7 +92,7 @@ static int optee_copy_firmware_node(const void *old_blob, void *fdt_blob) > > offs = fdt_add_subnode(fdt_blob, offs, "optee"); > if (offs < 0) > - return ret; > + return offs; > > /* copy the compatible property */ > prop = fdt_getprop(old_blob, old_offs, "compatible", &len); >
On Sun, Jan 26, 2020 at 11:20:54PM +0100, Christoph Müllner wrote: > As hinted by GCC 9, there is a return statement that returns > an uninitialized variable in optee_copy_firmware_node(). > This patch addresses this. > > Signed-off-by: Christoph Müllner <christoph.muellner at theobroma-systems.com> > Reviewed-by: Heiko Stuebner <heiko.stuebner at theobroma-systems.com> Applied to u-boot/master, thanks!
diff --git a/lib/optee/optee.c b/lib/optee/optee.c index 9b49eb8ee7..d4355c6d03 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -92,7 +92,7 @@ static int optee_copy_firmware_node(const void *old_blob, void *fdt_blob) offs = fdt_add_subnode(fdt_blob, offs, "optee"); if (offs < 0) - return ret; + return offs; /* copy the compatible property */ prop = fdt_getprop(old_blob, old_offs, "compatible", &len);
As hinted by GCC 9, there is a return statement that returns an uninitialized variable in optee_copy_firmware_node(). This patch addresses this. Signed-off-by: Christoph Müllner <christoph.muellner at theobroma-systems.com> --- lib/optee/optee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)