Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

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

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 4bab9028940a812cebf6dfbf0ad17785042c4287..2deccacc3aa759ad8dc3761d404a38cceb1034e0 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -328,7 +328,7 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
                                       void *priv)
 {
        struct fpga_bridge *bridge;
-       int id, ret = 0;
+       int id, ret;
 
        if (!name || !strlen(name)) {
                dev_err(dev, "Attempt to register with no name!\n");
@@ -340,10 +340,8 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
                return NULL;
 
        id = ida_simple_get(&fpga_bridge_ida, 0, 0, GFP_KERNEL);
-       if (id < 0) {
-               ret = id;
+       if (id < 0)
                goto error_kfree;
-       }
 
        mutex_init(&bridge->mutex);
        INIT_LIST_HEAD(&bridge->node);