Alexander Ponyatykh
b4412b7c70
* Convert source to 3.0 (quilt) format.
* Migrate from cdbs to debhelper.
* Merge from Ubuntu:
- libg15daemon_client/g15daemon_net.c: Fix a potential buffer overflow.
* debian/patches/07-reinit-on-any-error.diff: reinitialize on any error
returned by libusb to correctly recover after suspend/resume. (LP: #1357556)
* /etc/init.d/g15daemon: overhaul.
- Replace /dev/input/uinput with /dev/uinput. (Closes: bug#687663).
- Use "udevadm settle" instead of polling /dev/uinput.
- Use log_*_msg functions instead of echo.
- Add dependency on $remote_fs.
- Remove bashism. (Closes: bug#772244)
- Return 0 exit code if the daemon fails to start.
(LP: #617101, LP: #1103275)
- Don't stop or restart on udev events, because g15daemon now properly
handles replugging.
* Remove build dependency on libusb.
* Remove dependency on libg15daemon-client1 for g15daemon.
* Add dependency on udev for g15daemon.
* Change priority of packages to optional.
* Add native systemd service. (LP: #1441365)
* /etc/default/g15daemon: remove SWITCH_KEY option to keep systemd service
file simple.
* Add subsystem check to udev matching rules.
* Multiarchify the library packages. (Closes: bug#812952)
* Do not install *.la files.
* Change package description. (Closes: bug#802652)
23 lines
983 B
Diff
23 lines
983 B
Diff
Description: Reinitialize on any libusb error.
|
|
This allows g15daemon to correctly recover after suspend/resume.
|
|
Author: Alexander Ponyatykh <lazyranma@gmail.com>
|
|
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libusb/+bug/1357556
|
|
Forwarded: no
|
|
Last-Update: 2015-05-18
|
|
===================================================================
|
|
--- a/g15daemon/main.c
|
|
+++ b/g15daemon/main.c
|
|
@@ -204,10 +204,10 @@
|
|
G15_EVENT_KEYPRESS, keypresses);
|
|
lastkeys = keypresses;
|
|
|
|
- }else if(retval == -ENODEV && LIBG15_VERSION>=1200) {
|
|
+ }else if(retval < 0 && LIBG15_VERSION>=1200) {
|
|
pthread_mutex_lock(&g15lib_mutex);
|
|
while((retval=re_initLibG15() != G15_NO_ERROR) && !leaving){
|
|
- g15daemon_log(LOG_WARNING,"Keyboard has gone.. Retrying\n");
|
|
+ g15daemon_log(LOG_WARNING,"Keyboard error (%d).. Reinitializing\n", retval);
|
|
sleep(1);
|
|
}
|
|
if(!leaving) {
|