drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

prevent error to be shouted when the .probe() returns -ENODEV

Browse Source 
Seen on the second input node of the Roccat Kone XTD:
"ratbag error: ROCCAT Kone XTD: driver specified in hwdb not found: roccat

With the new hwdb matching, we should not try any other driver not having
the right id, so simplify the for loop to find the driver only.

Fixes #32

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2015-10-12 17:26:05 -04:00
parent c464c86fa4
commit 3d380af3a8
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/libratbag.c
View File

@@ -303,33 +303,38 @@ ratbag_find_driver(struct ratbag_device *device,
}
list_for_each(driver, &ratbag->drivers, link) {
if (!streq(driver->id, driver_name))
continue;
device->driver = driver;
if (test_device)
rc = driver->__test_probe(device, test_device);
else
rc = driver->probe(device);
if (rc == 0) {
if (!ratbag_sanity_check_device(device)) {
return NULL;
} else {
log_debug(ratbag, "driver match found: %s\n", driver->name);
return driver;
}
}
device->driver = NULL;
if (rc != -ENODEV) {
log_error(ratbag, "%s: no hidraw device found", device->name);
return NULL;
if (streq(driver->id, driver_name)) {
device->driver = driver;
break;
}
}
log_error(ratbag, "%s: driver specified in hwdb not found: %s\n", device->name, driver_name);
if (!device->driver) {
log_error(ratbag, "%s: driver specified in hwdb not found: %s\n",
device->name, driver_name);
return NULL;
}
if (test_device)
rc = device->driver->__test_probe(device, test_device);
else
rc = device->driver->probe(device);
if (rc == 0) {
if (!ratbag_sanity_check_device(device)) {
return NULL;
} else {
log_debug(ratbag, "driver match found: %s\n", driver->name);
return device->driver;
}
}
device->driver = NULL;
if (rc != -ENODEV) {
log_error(ratbag, "%s: no hidraw device found", device->name);
return NULL;
}
return NULL;
}