phy: Fix possible NULL pointer deference

[oweals/u-boot.git] / drivers / gpio / dwapb_gpio.c

diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index 04a2381acd818ceb045d2fbcfa80237f71e611d9..e5e35181940ce2a41ad6458dea74c7b668e26503 100644 (file)
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -6,16 +6,20 @@
  */
 
 #include <common.h>
+#include <log.h>
 #include <malloc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <dm/device_compat.h>
+#include <dm/devres.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <errno.h>
 #include <reset.h>
+#include <linux/bitops.h>
 
 #define GPIO_SWPORT_DR(p)      (0x00 + (p) * 0xc)
 #define GPIO_SWPORT_DDR(p)     (0x04 + (p) * 0xc)
@@ -185,12 +189,11 @@ static int gpio_dwapb_bind(struct udevice *dev)
                        plat->name = ofnode_get_name(node);
                }
 
-               ret = device_bind(dev, dev->driver, plat->name,
-                                 plat, -1, &subdev);
+               ret = device_bind_ofnode(dev, dev->driver, plat->name,
+                                        plat, node, &subdev);
                if (ret)
                        return ret;
 
-               dev->node = node;
                bank++;
        }