From: Timo Kokkonen <kaapeli@itanic.dy.fi>
Date: Fri, 29 Apr 2011 20:37:03 +0000 (+0300)
Subject: Fix crossed vendor and product IDs
X-Git-Url: http://git.itanic.dy.fi/?p=glucose;a=commitdiff_plain;h=05208fc1a6899dde808a288d543b1f18ccaf7ebe

Fix crossed vendor and product IDs

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
---

diff --git a/hiddev.c b/hiddev.c
index ae1423d..6d3d5d3 100644
--- a/hiddev.c
+++ b/hiddev.c
@@ -187,7 +187,7 @@ int hiddev_open_by_id(int vendor_id, int product_id, int *usage_code)
 		strncat(path, HIDDEV_PATH, sizeof(path) - 1);
 		strncat(path, dirent->d_name, sizeof(path) - 1);
 
-		fd = _hiddev_open(path, usage_code, product_id, vendor_id);
+		fd = _hiddev_open(path, usage_code, vendor_id, product_id);
 		if (fd < 0)
 			continue;
 		return fd;
diff --git a/main.c b/main.c
index 6b8f91c..f61f05f 100644
--- a/main.c
+++ b/main.c
@@ -282,8 +282,8 @@ int main(int argc, char *argv[])
 	trace_level = opts.trace_level;
 
 	if (opts.usbdev == NULL)
-		fd = hiddev_open_by_id(CONTOUR_USB_PRODUCT_ID,
-				CONTOUR_USB_VENDOR_ID, &usage_code);
+		fd = hiddev_open_by_id(CONTOUR_USB_VENDOR_ID,
+				CONTOUR_USB_PRODUCT_ID, &usage_code);
 	else
 		fd = hiddev_open(opts.usbdev, &usage_code);
 	if (fd < 0)