sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

udev: Fix matching to prefer entries with VID and PID

This commit is contained in:
Marcel Holtmann 2012-05-26 07:35:58 +02:00
parent fba1efe1a5
commit d5dc9c967d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/udevng.c
View File

@ -911,6 +911,7 @@ static void add_device(const char *syspath, const char *devname,
else
sysattr = NULL;
DBG("%s", syspath);
DBG("%s", devpath);
DBG("%s (%s) %s [%s] ==> %s %s", devnode, driver,
interface, number, label, sysattr);
@ -1033,7 +1034,7 @@ static void check_usb_device(struct udev_device *device)
driver = vendor_list[i].driver;
vendor = vid;
model = pid;
break;
continue;
}
if (vid == NULL || pid == NULL)
@ -1041,11 +1042,9 @@ static void check_usb_device(struct udev_device *device)
if (g_str_equal(vendor_list[i].vid, vid) == TRUE) {
if (vendor_list[i].pid == NULL) {
if (driver == NULL) {
driver = vendor_list[i].driver;
vendor = vid;
model = pid;
}
driver = vendor_list[i].driver;
vendor = vid;
model = pid;
continue;
}