Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/rspi', 'spi/topic...

[sfrench/cifs-2.6.git] / drivers / spi / spi-rspi.c

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index bc3c8686f4d95fb5cb5f7973423498a0d9f3eb5e..2a10b3f94ff72a4ea3d6924a082ef6d2db174528 100644 (file)
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -1226,10 +1226,8 @@ static int rspi_probe(struct platform_device *pdev)
        const struct spi_ops *ops;
 
        master = spi_alloc_master(&pdev->dev, sizeof(struct rspi_data));
        const struct spi_ops *ops;
 
        master = spi_alloc_master(&pdev->dev, sizeof(struct rspi_data));

-       if (master == NULL) {
-               dev_err(&pdev->dev, "spi_alloc_master error.\n");
+       if (master == NULL)

                return -ENOMEM;
                return -ENOMEM;

-       }

 
        of_id = of_match_device(rspi_of_match, &pdev->dev);
        if (of_id) {
 
        of_id = of_match_device(rspi_of_match, &pdev->dev);
        if (of_id) {