DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

Allow a NULL udev device for ratbag_device_new

Browse Source 
The client-exposed API requires a valid device, but internally we can handle
NULL - this way we can hook up the test suite easier.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2015-09-03 13:13:07 +10:00
committed by Benjamin Tissoires
parent 9deaedbfc5
commit 04fa488a22
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libratbag.c
View File

@@ -260,7 +260,8 @@ ratbag_device_new(struct ratbag *ratbag, struct udev_device *udev_device,
device->ratbag = ratbag_ref(ratbag);
device->hidraw_fd = -1;
device->refcount = 1;
device->udev_device = udev_device_ref(udev_device);
if (udev_device)
device->udev_device = udev_device_ref(udev_device);
device->ids = *id;
list_init(&device->profiles);
@@ -476,6 +477,10 @@ ratbag_device_new_from_udev_device(struct ratbag *ratbag,
return NULL;
}
if (!udev_device) {
log_bug_client(ratbag, "udev device is NULL.\n");
return NULL;
}
if (get_product_id(udev_device, &id) != 0)
goto out_err;