dcavalca / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone
7f93bc2
From da9ec06bdc8b1898b33c78d855875245d9c38875 Mon Sep 17 00:00:00 2001
a59965a
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
a59965a
Date: Fri, 30 May 2014 13:16:56 -0400
a59965a
Subject: [PATCH] udev-builtin-keyboard: do tell on which device EVIOCSKEYCODE
a59965a
 failed.
a59965a
a59965a
I am getting
a59965a
a59965a
"Error calling EVIOCSKEYCODE (scan code 0xc022d, key code 418): Invalid
a59965a
argument", the error message does not tell on which specific device the
a59965a
problem is, add that info.
a59965a
a59965a
(cherry picked from commit a52ec8ed881537627869afa8f0486db7e20ce2db)
a59965a
(cherry picked from commit 55cf7f15b43583bbb17bbe7220aedefeeb39e141)
a59965a
a59965a
Conflicts:
a59965a
	src/udev/udev-builtin-keyboard.c
a59965a
---
a59965a
 src/udev/udev-builtin-keyboard.c | 2 +-
a59965a
 1 file changed, 1 insertion(+), 1 deletion(-)
a59965a
a59965a
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
1cc3df3
index 8f457ab4a2..6357931f49 100644
a59965a
--- a/src/udev/udev-builtin-keyboard.c
a59965a
+++ b/src/udev/udev-builtin-keyboard.c
a59965a
@@ -143,7 +143,7 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo
a59965a
                         log_debug("keyboard: mapping scan code %d (0x%x) to key code %d (0x%x)\n",
a59965a
                                   map[i].scan, map[i].scan, map[i].key, map[i].key);
a59965a
                         if (ioctl(fd, EVIOCSKEYCODE, &map[i]) < 0)
a59965a
-                                log_error("Error calling EVIOCSKEYCODE: %m\n");
a59965a
+                                log_error("Error calling EVIOCSKEYCODE on device node '%s' (scan code 0x%x, key code %d): %m", node, map[i].scan, map[i].key);
a59965a
                 }
a59965a
 
a59965a
                 /* install list of force-release codes */