Merge tag 'v5.15.61' into rpi-5.15.y

[platform/kernel/linux-rpi.git] / net / 9p / trans_virtio.c

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 2bbd7dc..d110df3 100644 (file)
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -199,7 +199,7 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)
 /* Reply won't come, so drop req ref */
 static int p9_virtio_cancelled(struct p9_client *client, struct p9_req_t *req)
 {
-       p9_req_put(req);
+       p9_req_put(client, req);
        return 0;
 }
 
@@ -523,7 +523,7 @@ err_out:
        kvfree(out_pages);
        if (!kicked) {
                /* reply won't come */
-               p9_req_put(req);
+               p9_req_put(client, req);
        }
        return err;
 }
@@ -610,7 +610,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)
        chan->vc_wq = kmalloc(sizeof(wait_queue_head_t), GFP_KERNEL);
        if (!chan->vc_wq) {
                err = -ENOMEM;
-               goto out_free_tag;
+               goto out_remove_file;
        }
        init_waitqueue_head(chan->vc_wq);
        chan->ring_bufs_avail = 1;
@@ -628,6 +628,8 @@ static int p9_virtio_probe(struct virtio_device *vdev)
 
        return 0;
 
+out_remove_file:
+       sysfs_remove_file(&vdev->dev.kobj, &dev_attr_mount_tag.attr);
 out_free_tag:
        kfree(tag);
 out_free_vq: