projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
arch
/
um
/
drivers
/
virtio_uml.c
diff --git
a/arch/um/drivers/virtio_uml.c
b/arch/um/drivers/virtio_uml.c
index
4412d6f
..
d51e445
100644
(file)
--- a/
arch/um/drivers/virtio_uml.c
+++ b/
arch/um/drivers/virtio_uml.c
@@
-27,6
+27,7
@@
#include <linux/virtio_config.h>
#include <linux/virtio_ring.h>
#include <linux/time-internal.h>
#include <linux/virtio_config.h>
#include <linux/virtio_ring.h>
#include <linux/time-internal.h>
+#include <linux/virtio-uml.h>
#include <shared/as-layout.h>
#include <irq_kern.h>
#include <init.h>
#include <shared/as-layout.h>
#include <irq_kern.h>
#include <init.h>
@@
-1139,7
+1140,7
@@
static int virtio_uml_probe(struct platform_device *pdev)
rc = os_connect_socket(pdata->socket_path);
} while (rc == -EINTR);
if (rc < 0)
rc = os_connect_socket(pdata->socket_path);
} while (rc == -EINTR);
if (rc < 0)
-
return rc
;
+
goto error_free
;
vu_dev->sock = rc;
spin_lock_init(&vu_dev->sock_lock);
vu_dev->sock = rc;
spin_lock_init(&vu_dev->sock_lock);
@@
-1160,6
+1161,8
@@
static int virtio_uml_probe(struct platform_device *pdev)
error_init:
os_close_file(vu_dev->sock);
error_init:
os_close_file(vu_dev->sock);
+error_free:
+ kfree(vu_dev);
return rc;
}
return rc;
}