Changeset 8fed3ef in mainline

Timestamp:

2019-02-06T22:15:59Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2332e13

Parents:

e2f332c

Message:

Improve error handling in virtio-net

File:

• uspace/drv/nic/virtio-net/virtio-net.c (modified) (4 diffs)

uspace/drv/nic/virtio-net/virtio-net.c

@@ -211 +211 @@
                 ddf_msg(LVL_NOTE, "Unsupported number of virtqueues: %u",
                     num_queues);
+                rc = ELIMIT;
                 goto fail;
         }
@@ -404 +405 @@
         if (fun == NULL) {
                 rc = ENOMEM;
-                goto error;
+                goto uninitialize;
         }
         nic_t *nic = ddf_dev_data_get(dev);
@@ -418 +419 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding device function");
-                goto uninitialize;
+                goto destroy;
         }
 
@@ -434 +435 @@
 unbind:
         ddf_fun_unbind(fun);
+destroy:
+        ddf_fun_destroy(fun);
 uninitialize:
         virtio_net_uninitialize(dev);
-error:
         return rc;
 }