diff options
| author |   Joel Stanley <joel@jms.id.au> | 2019-06-20 18:47:38 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-06-22 16:56:35 +0930 |
| commit | c8a3b9b50d8331528fc8d03aadd1fec3d60362d7 (patch) | |
| tree | 5b82051ee7d05157eb143a5cbb6748d2c6f9ab3e /drivers/soc | |
| parent | soc: aspeed: lpc-ctrl: make parameter optional (diff) | |
| download | linux-dev-c8a3b9b50d8331528fc8d03aadd1fec3d60362d7.tar.xz linux-dev-c8a3b9b50d8331528fc8d03aadd1fec3d60362d7.zip | |
soc: aspeed: lpc-ctrl: Fix probe error handling
gcc warns that a mising "flash" phandle node leads to undefined
behavior later:
drivers/soc/aspeed/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe':
drivers/soc/aspeed/aspeed-lpc-ctrl.c:201:18: error: '*((void *)&resm+8)' may be used uninitialized in this function [-Werror=maybe-uninitialized]
Only set the flash base and size if we find a phandle in the device
tree.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Vijay Khemka <vijaykhemka@fb.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/aspeed/aspeed-lpc-ctrl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c index aca13779764a..eee26c2d8b52 100644 --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c @@ -223,10 +223,11 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) dev_err(dev, "Couldn't address to resource for flash\n"); return rc; } + + lpc_ctrl->pnor_size = resource_size(&resm); + lpc_ctrl->pnor_base = resm.start; } - lpc_ctrl->pnor_size = resource_size(&resm); - lpc_ctrl->pnor_base = resm.start; dev_set_drvdata(&pdev->dev, lpc_ctrl); |