Re: [v3] spi: orion: support armada extended baud rates

[Greg Ungerer <gerg@xxxxxxxxxxx>]

Hi Karl,

On 12/10/14 00:52, Karl Beldan wrote:
> On 28/09/14 23:24:04, Greg Ungerer wrote:
>> @@ -378,6 +452,10 @@ static int orion_spi_probe(struct platform_device *pdev)
>>  	spi = spi_master_get_devdata(master);
>>  	spi->master = master;
>>  
>> +	of_id = of_match_device(orion_spi_of_match_table, &pdev->dev);
>> +	devdata = of_id->data;
>> +	spi->devdata = devdata;
>> +
> Won't of_match_device return NULL on non-DT systems, and further
> references oops ?

Yes, sure enough.

So I propose to fix with this change.

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index acf8e48..c069ccd 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -453,7 +453,7 @@ static int orion_spi_probe(struct platform_device *pdev)
        spi->master = master;
 
        of_id = of_match_device(orion_spi_of_match_table, &pdev->dev);
-       devdata = of_id->data;
+       devdata = (of_id) ? of_id->data : &orion_spi_dev_data;
        spi->devdata = devdata;
 
        spi->clk = devm_clk_get(&pdev->dev, NULL);


Mark: This was generated on linux-3.17-rc7 with the first spi-orion
patch applied. What do you want it generated against?

Regards
Greg


--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html