Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / w1 / masters / w1-gpio.c

diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 530c77b8d062b8287956e9f4a0b2c63d775cd1bf..e45acb6d916ee3a69af868710b3507a28c20f2e8 100644 (file)
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -101,10 +101,8 @@ static int w1_gpio_probe(struct platform_device *pdev)
 
        master = devm_kzalloc(dev, sizeof(struct w1_bus_master),
                        GFP_KERNEL);
-       if (!master) {
-               dev_err(dev, "Out of memory\n");
+       if (!master)
                return -ENOMEM;
-       }
 
        pdata->gpiod = devm_gpiod_get_index(dev, NULL, 0, gflags);
        if (IS_ERR(pdata->gpiod)) {