Fix crossed vendor and product IDs

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

diff --git a/hiddev.c b/hiddev.c
index ae1423d1ef6094f8f73f4fa8aaed24886386a9d3..6d3d5d30e3afc13706e465addf00d1a45fedded7 100644 (file)
--- 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 6b8f91cdd6b1f913d36d0adc620f59b9b904a0f6..f61f05ffb210f7579215e37172ec77da4617ed70 100644 (file)
--- 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)