Merge tag '9p-for-5.3' of git://github.com/martinetd/linux

[sfrench/cifs-2.6.git] / net / 9p / trans_xen.c

diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c
index 29420ebb8f070acfa01c11b979285ecd6c2c82a2..3963eb11c3fbdd841197f9d9ac7f9426db52ecba 100644 (file)
--- a/net/9p/trans_xen.c
+++ b/net/9p/trans_xen.c
@@ -530,13 +530,19 @@ static struct xenbus_driver xen_9pfs_front_driver = {
 
 static int p9_trans_xen_init(void)
 {
+       int rc;
+
        if (!xen_domain())
                return -ENODEV;
 
        pr_info("Initialising Xen transport for 9pfs\n");
 
        v9fs_register_trans(&p9_xen_trans);
-       return xenbus_register_frontend(&xen_9pfs_front_driver);
+       rc = xenbus_register_frontend(&xen_9pfs_front_driver);
+       if (rc)
+               v9fs_unregister_trans(&p9_xen_trans);
+
+       return rc;
 }
 module_init(p9_trans_xen_init);