Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index e850d03e719047638465916633981670da1b51a4..45b09142afe2defcd6be0ed9d0f9a7ea7aa1fc15 100644 (file)
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -642,10 +642,8 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
        u32 num_cs = 1;
 
        info = devm_kzalloc(dev, sizeof(struct sh_msiof_spi_info), GFP_KERNEL);
-       if (!info) {
-               dev_err(dev, "failed to allocate setup data\n");
+       if (!info)
                return NULL;
-       }
 
        /* Parse the MSIOF properties */
        of_property_read_u32(np, "num-cs", &num_cs);