[PATCH 10/11] spi/s3c64xx: improve error handling
Thomas Abraham
thomas.abraham at linaro.org
Fri Aug 10 02:58:44 EDT 2012
On 8 August 2012 20:17, Arnd Bergmann <arnd at arndb.de> wrote:
> When a device tree definition os an s3c64xx SPI master is missing
> a "controller-data" subnode, the newly added s3c64xx_get_slave_ctrldata
> function might use uninitialized memory in place of that node,
> which was correctly reported by gcc.
>
> Without this patch, building s3c6400_defconfig results in:
>
> drivers/spi/spi-s3c64xx.c: In function 's3c64xx_get_slave_ctrldata.isra.25':
> drivers/spi/spi-s3c64xx.c:841:5: warning: 'data_np' may be used uninitialized in this function [-Wuninitialized]
>
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> Cc: Thomas Abraham <thomas.abraham at linaro.org>
> Cc: Jaswinder Singh <jaswinder.singh at linaro.org>
> Cc: Grant Likely <grant.likely at secretlab.ca>
> Cc: Kukjin Kim <kgene.kim at samsung.com>
> ---
> drivers/spi/spi-s3c64xx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
> index 646a765..cfa2c35 100644
> --- a/drivers/spi/spi-s3c64xx.c
> +++ b/drivers/spi/spi-s3c64xx.c
> @@ -826,7 +826,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
> struct spi_device *spi)
> {
> struct s3c64xx_spi_csinfo *cs;
> - struct device_node *slave_np, *data_np;
> + struct device_node *slave_np, *data_np = NULL;
> u32 fb_delay = 0;
>
> slave_np = spi->dev.of_node;
> --
> 1.7.10
>
Acked-by: Thomas Abraham <thomas.abraham at linaro.org>
More information about the linux-arm-kernel
mailing list