return ret;
        list_add_tail(&mdev_link->list, &mdev_link_list);
        mdev_link->create_link = tmp;
+       mdev_link->destroy_link = false;
+
        return count;
 }
 
                return ret;
        if (!tmp)
                return count;
-       mdev_link->destroy_link = tmp;
+
        ret = most_remove_link(mdev_link->device, mdev_link->channel,
                               mdev_link->comp);
        if (ret)
                return ret;
        if (!list_empty(&mdev_link_list))
                list_del(&mdev_link->list);
+
+       mdev_link->destroy_link = tmp;
+
        return count;
 }
 
        struct mdev_link *mdev_link = to_mdev_link(item);
        int ret;
 
-       if (!list_empty(&mdev_link_list)) {
-               ret = most_remove_link(mdev_link->device, mdev_link->channel,
-                                      mdev_link->comp);
-               if (ret && (ret != -ENODEV))
-                       pr_err("Removing link failed.\n");
-               list_del(&mdev_link->list);
+       if (mdev_link->destroy_link)
+               goto free_item;
+
+       ret = most_remove_link(mdev_link->device, mdev_link->channel,
+                              mdev_link->comp);
+       if (ret) {
+               pr_err("Removing link failed.\n");
+               goto free_item;
        }
+
+       if (!list_empty(&mdev_link_list))
+               list_del(&mdev_link->list);
+
+free_item:
        kfree(to_mdev_link(item));
 }