From effd574a632c78f70887368c8296d133157c2a3c Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 28 Mar 2013 17:49:22 +0100 Subject: [PATCH] option: don't apply both vendor and product filters at the same time The probing logic expects either one or the other right now. In this case, it is just simpler to include the Nozomi-related VID in the vendor filter, and remove the product filter. --- plugins/option/mm-plugin-option.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/option/mm-plugin-option.c b/plugins/option/mm-plugin-option.c index 24b8a4bc..251e039f 100644 --- a/plugins/option/mm-plugin-option.c +++ b/plugins/option/mm-plugin-option.c @@ -91,10 +91,9 @@ G_MODULE_EXPORT MMPlugin * mm_plugin_create (void) { static const gchar *subsystems[] = { "tty", NULL }; - static const guint16 vendor_ids[] = { 0x0af0, 0 }; /* Option USB devices */ - static const mm_uint16_pair product_ids[] = { { 0x1931, 0x000c }, /* Nozomi CardBus devices */ - { 0, 0 } - }; + static const guint16 vendor_ids[] = { 0x0af0, /* Option USB devices */ + 0x1931, /* Nozomi CardBus devices */ + 0 }; static const gchar *drivers[] = { "option1", "option", "nozomi", NULL }; return MM_PLUGIN ( @@ -103,7 +102,6 @@ mm_plugin_create (void) MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, MM_PLUGIN_ALLOWED_DRIVERS, drivers, MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, - MM_PLUGIN_ALLOWED_PRODUCT_IDS, product_ids, MM_PLUGIN_ALLOWED_AT, TRUE, NULL)); }