Re: [PATCH 1/2] spi/spi_s3c64xx: Make probe more robust againstmissing board config

[Grant Likely]

On Fri, Aug 20, 2010 at 05:17:07PM +0100, Mark Brown wrote:
> The S3C64xx SPI driver requires the machine to call s3c64xx_spi_set_info()
> to select a few options, including the clock to use for the SPI controller.
> If this is not done then a NULL will be passed as the clock name for
> clk_get(), causing an obscure crash. Guard against this and other missing
> configuration by validating that the clock name has been filled in in
> the platform data that ets passed in.
> 
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>

Both patches applied, thanks.

g.

> ---
>  drivers/spi/spi_s3c64xx.c |    9 +++++++--
>  1 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi_s3c64xx.c b/drivers/spi/spi_s3c64xx.c
> index 9736581..a0b63b7 100644
> --- a/drivers/spi/spi_s3c64xx.c
> +++ b/drivers/spi/spi_s3c64xx.c
> @@ -919,6 +919,13 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
>  		return -ENODEV;
>  	}
>  
> +	sci = pdev->dev.platform_data;
> +	if (!sci->src_clk_name) {
> +		dev_err(&pdev->dev,
> +			"Board init must call s3c64xx_spi_set_info()\n");
> +		return -EINVAL;
> +	}
> +
>  	/* Check for availability of necessary resource */
>  
>  	dmatx_res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
> @@ -946,8 +953,6 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  	}
>  
> -	sci = pdev->dev.platform_data;
> -
>  	platform_set_drvdata(pdev, master);
>  
>  	sdd = spi_master_get_devdata(master);
> -- 
> 1.7.1
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/