summaryrefslogtreecommitdiff
path: root/debian/patches/fix-devnode0001-devnode-fix-falling-back-to-the-kernel-driver.patch
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2016-02-07 18:15:41 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2016-02-07 18:15:41 +0100
commit31bc1905e71d04103736fbb6951453659bc0b634 (patch)
tree7007a0cc6d73bd4cfd1101c8ed2701aadc554661 /debian/patches/fix-devnode0001-devnode-fix-falling-back-to-the-kernel-driver.patch
parentd304948783b731feaa73585070380976c9956540 (diff)
drop merged patches
Diffstat (limited to 'debian/patches/fix-devnode0001-devnode-fix-falling-back-to-the-kernel-driver.patch')
-rw-r--r--debian/patches/fix-devnode0001-devnode-fix-falling-back-to-the-kernel-driver.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/debian/patches/fix-devnode0001-devnode-fix-falling-back-to-the-kernel-driver.patch b/debian/patches/fix-devnode0001-devnode-fix-falling-back-to-the-kernel-driver.patch
deleted file mode 100644
index 48706c66..00000000
--- a/debian/patches/fix-devnode0001-devnode-fix-falling-back-to-the-kernel-driver.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ef4a4280e0f372c26f9c5fe2068312b443f82d24 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Sat, 2 Jan 2016 19:18:40 +0100
-Subject: [PATCH hurd] devnode: fix falling back to the kernel driver
-
-* devnode/devnode.c (ds_device_open): Do not exit if opening the
-master device fails.
-(parse_opt): Likewise.
----
- devnode/devnode.c | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/devnode/devnode.c b/devnode/devnode.c
-index 2802471..a5120d7 100644
---- a/devnode/devnode.c
-+++ b/devnode/devnode.c
-@@ -153,12 +153,20 @@ ds_device_open (mach_port_t master_port, mach_port_t reply_port,
-
- if (master_file != NULL)
- {
-- if (master_device != MACH_PORT_NULL)
-+ mach_port_t md;
-+ if (MACH_PORT_VALID (master_device))
- mach_port_deallocate (mach_task_self (), master_device);
--
-- master_device = file_name_lookup (master_file, 0, 0);
-- if (master_device == MACH_PORT_NULL)
-- error (1, errno, "file_name_lookup");
-+ md = file_name_lookup (master_file, 0, 0);
-+ if (MACH_PORT_VALID (md))
-+ master_device = md;
-+ else
-+ {
-+ error (0, 0, "%s: %s.\nFalling back to kernel driver.",
-+ master_file, strerror (errno));
-+ err = get_privileged_ports (0, &master_device);
-+ if (err)
-+ return err;
-+ }
- }
-
- err = device_open (master_device, mode, device_name, device);
-@@ -298,7 +306,8 @@ parse_opt (int opt, char *arg, struct argp_state *state)
- master_file = arg;
- master_device = file_name_lookup (arg, 0, 0);
- if (master_device == MACH_PORT_NULL)
-- error (1, errno, "file_name_lookup");
-+ error (0, 0, "%s: %s.\nFalling back to kernel driver.",
-+ arg, strerror (errno));
- break;
- case 'n':
- user_device_name = arg;
---
-2.1.4
-