Merge airlied/drm-next into drm-misc-next

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

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index d27e8d2a149cb89fd9f44cb8aa5634ac56d1415e..9939d2cbc9a6cbca56d5f3e59ce0e068146919dc 100644 (file)
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -412,8 +412,6 @@ static struct fpga_manager *__fpga_mgr_get(struct device *dev)
        struct fpga_manager *mgr;
 
        mgr = to_fpga_manager(dev);
-       if (!mgr)
-               goto err_dev;
 
        if (!try_module_get(dev->parent->driver->owner))
                goto err_dev;
@@ -569,6 +567,7 @@ int fpga_mgr_register(struct device *dev, const char *name,
 
        device_initialize(&mgr->dev);
        mgr->dev.class = fpga_mgr_class;
+       mgr->dev.groups = mops->groups;
        mgr->dev.parent = dev;
        mgr->dev.of_node = dev->of_node;
        mgr->dev.id = id;