Merge remote-tracking branch 'spi/topic/coldfire-qspi' into spi-next

[linux-beck.git] / drivers / spi / spi-coldfire-qspi.c

diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 9a7db9d1b4ca68a6a812150bdbdd523acbec68e8..15cda45afec606abff5a4122391f966e49c93044 100644 (file)
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -400,6 +400,12 @@ static int mcfqspi_probe(struct platform_device *pdev)
        struct mcfqspi_platform_data *pdata;
        int status;
 
+       pdata = pdev->dev.platform_data;
+       if (!pdata) {
+               dev_dbg(&pdev->dev, "platform data is missing\n");
+               return -ENOENT;
+       }
+
        master = spi_alloc_master(&pdev->dev, sizeof(*mcfqspi));
        if (master == NULL) {
                dev_dbg(&pdev->dev, "spi_alloc_master failed\n");
@@ -450,11 +456,6 @@ static int mcfqspi_probe(struct platform_device *pdev)
        }
        clk_enable(mcfqspi->clk);
 
-       pdata = pdev->dev.platform_data;
-       if (!pdata) {
-               dev_dbg(&pdev->dev, "platform data is missing\n");
-               goto fail4;
-       }
        master->bus_num = pdata->bus_num;
        master->num_chipselect = pdata->num_chipselect;