Skip to content

Commit

Permalink
spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe
Browse files Browse the repository at this point in the history
Clang warns:

drivers/spi/spi-bcm2835aux.c:532:50: warning: variable 'err' is
uninitialized when used here [-Wuninitialized]
                dev_err(&pdev->dev, "could not get clk: %d\n", err);
                                                               ^~~
./include/linux/dev_printk.h:112:32: note: expanded from macro 'dev_err'
        _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
                                      ^~~~~~~~~~~
drivers/spi/spi-bcm2835aux.c:495:9: note: initialize the variable 'err'
to silence this warning
        int err;
               ^
                = 0
1 warning generated.

Restore the assignment so that the error value can be used in the
dev_err statement and there is no uninitialized memory being leaked.

Fixes: e13ee6c ("spi: bcm2835aux: Fix use-after-free on unbind")
Link: ClangBuiltLinux#1199
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://lore.kernel.org/r/20201113180701.455541-1-natechancellor@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
nathanchance authored and broonie committed Nov 13, 2020
1 parent c371dcf commit d853b34
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/spi/spi-bcm2835aux.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,9 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)

bs->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(bs->clk)) {
err = PTR_ERR(bs->clk);
dev_err(&pdev->dev, "could not get clk: %d\n", err);
return PTR_ERR(bs->clk);
return err;
}

bs->irq = platform_get_irq(pdev, 0);
Expand Down

0 comments on commit d853b34

Please sign in to comment.