Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[linux-2.6-microblaze.git] / drivers / spi / spi-bcm2835aux.c

diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
index 40dfb7f..bb57035 100644 (file)
--- a/drivers/spi/spi-bcm2835aux.c
+++ b/drivers/spi/spi-bcm2835aux.c
@@ -496,10 +496,8 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
        int err;
 
        master = spi_alloc_master(&pdev->dev, sizeof(*bs));
-       if (!master) {
-               dev_err(&pdev->dev, "spi_alloc_master() failed\n");
+       if (!master)
                return -ENOMEM;
-       }
 
        platform_set_drvdata(pdev, master);
        master->mode_bits = (SPI_CPOL | SPI_CS_HIGH | SPI_NO_CS);