Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / drivers / spi / spi-tle62x0.c

diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c
index 2d4010d80824a189710cf851f1a5c8e84226b26b..daf5aa1c24c385d80d32a91531c06476564fec87 100644 (file)
--- a/drivers/spi/spi-tle62x0.c
+++ b/drivers/spi/spi-tle62x0.c
@@ -253,10 +253,8 @@ static int tle62x0_probe(struct spi_device *spi)
        }
 
        st = kzalloc(sizeof(struct tle62x0_state), GFP_KERNEL);
-       if (st == NULL) {
-               dev_err(&spi->dev, "no memory for device state\n");
+       if (st == NULL)
                return -ENOMEM;
-       }
 
        st->us = spi;
        st->nr_gpio = pdata->gpio_count;