Merge tag 'nios2-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[linux.git] / drivers / fpga / fpga-bridge.c

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 0dfe9d78cee214f8d73a9749039a4158c42da279..31bd2c59c305940fd77bbf81712f50f198743698 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -78,8 +78,6 @@ static struct fpga_bridge *__fpga_bridge_get(struct device *dev,
        int ret = -ENODEV;
 
        bridge = to_fpga_bridge(dev);
-       if (!bridge)
-               goto err_dev;
 
        bridge->info = info;
 
@@ -367,6 +365,7 @@ int fpga_bridge_register(struct device *dev, const char *name,
        bridge->priv = priv;
 
        device_initialize(&bridge->dev);
+       bridge->dev.groups = br_ops->groups;
        bridge->dev.class = fpga_bridge_class;
        bridge->dev.parent = dev;
        bridge->dev.of_node = dev->of_node;