From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Ungerer Subject: Re: [v3] spi: orion: support armada extended baud rates Date: Tue, 14 Oct 2014 12:03:12 +1000 Message-ID: <543C8460.1060508@uclinux.org> References: <20141011144857.GA17350@gobelin> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Karl Beldan Return-path: In-Reply-To: <20141011144857.GA17350@gobelin> Sender: linux-spi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: 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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html