git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From d4ff364285a62c6a6302e8b95a0276b162590e4a Mon Sep 17 00:00:00 2001
   2 From: Jonathan Bell <jonathan@raspberrypi.com>
   3 Date: Wed, 24 Jan 2024 11:13:19 +0000
   4 Subject: [PATCH 0851/1085] drivers: w1-gpio: Fixup uninitialised variable use
   5  in w1_gpio_probe
   6
   7 Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
   8 ---
   9  drivers/w1/masters/w1-gpio.c | 10 +++++-----
  10  1 file changed, 5 insertions(+), 5 deletions(-)
  11
  12 --- a/drivers/w1/masters/w1-gpio.c
  13 +++ b/drivers/w1/masters/w1-gpio.c
  14 @@ -76,6 +76,11 @@ static int w1_gpio_probe(struct platform
  15         enum gpiod_flags gflags = GPIOD_OUT_LOW_OPEN_DRAIN;
  16         int err;
  17
  18 +       master = devm_kzalloc(dev, sizeof(struct w1_bus_master),
  19 +                       GFP_KERNEL);
  20 +       if (!master)
  21 +               return -ENOMEM;
  22 +
  23         if (of_have_populated_dt() && !dev_get_platdata(&pdev->dev)) {
  24                 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
  25                 if (!pdata)
  26 @@ -102,11 +107,6 @@ static int w1_gpio_probe(struct platform
  27                 return -ENXIO;
  28         }
  29
  30 -       master = devm_kzalloc(dev, sizeof(struct w1_bus_master),
  31 -                       GFP_KERNEL);
  32 -       if (!master)
  33 -               return -ENOMEM;
  34 -
  35         pdata->gpiod = devm_gpiod_get_index(dev, NULL, 0, gflags);
  36         if (IS_ERR(pdata->gpiod)) {
  37                 dev_err(dev, "gpio_request (pin) failed\n");