diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-03-22 16:35:04 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-03-22 16:35:04 +0100 |
| commit | e33a07f421a84e54360628354e4faa0cf4a5d36f (patch) | |
| tree | e8e91a743bd008618183c9122a9269e1a2863e7c /xen | |
| parent | 7e59fbeb2f05e1400dadbbd2d9c93d8bd2ad8178 (diff) | |
| parent | 3ce4896345a3c339f159674ddf15e28b5072cb62 (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/gnumach
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/block.c | 5 | ||||
| -rw-r--r-- | xen/net.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/xen/block.c b/xen/block.c index bd3758f..d98b31e 100644 --- a/xen/block.c +++ b/xen/block.c @@ -382,8 +382,8 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, port = ipc_port_alloc_kernel(); if (port == IP_NULL) { - err = KERN_RESOURCE_SHORTAGE; - goto out; + device_close(bd); + return KERN_RESOURCE_SHORTAGE; } bd->port = port; @@ -396,7 +396,6 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, ipc_port_nsrequest (bd->port, 1, notify, ¬ify); assert (notify == IP_NULL); -out: if (IP_VALID (reply_port)) ds_device_open_reply (reply_port, reply_port_type, D_SUCCESS, port); else @@ -568,8 +568,8 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, port = ipc_port_alloc_kernel(); if (port == IP_NULL) { - err = KERN_RESOURCE_SHORTAGE; - goto out; + device_close (nd); + return KERN_RESOURCE_SHORTAGE; } nd->port = port; @@ -582,7 +582,6 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, ipc_port_nsrequest (nd->port, 1, notify, ¬ify); assert (notify == IP_NULL); -out: if (IP_VALID (reply_port)) ds_device_open_reply (reply_port, reply_port_type, D_SUCCESS, dev_to_port(nd)); else |