Merge tag 'v4.16-rc2' into locking/core, to refresh the branch

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

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index 223f2401939bc7b13601e8a6ec2b03e7866b3ba9..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;