Add sr_ prefix to list_hwplugins().

[libsigrok.git] / device.c

diff --git a/device.c b/device.c
index 2dee902cdae15d2f2d9af6f9104e1c2245d63d09..bf87e811e90c6ffb9530214b0fcf381215bde610 100644 (file)
--- a/device.c
+++ b/device.c
@@ -30,7 +30,7 @@ void sr_device_scan(void)
        GSList *plugins, *l;
        struct sr_device_plugin *plugin;
 
-       plugins = list_hwplugins();
+       plugins = sr_list_hwplugins();
 
        /*
         * Initialize all plugins first. Since the init() call may involve
@@ -235,6 +235,9 @@ gboolean sr_device_has_hwcap(struct sr_device *device, int hwcap)
 {
        int *capabilities, i;
 
+       if (!device || !device->plugin)
+               return;
+
        if ((capabilities = device->plugin->get_capabilities()))
                for (i = 0; capabilities[i]; i++)
                        if (capabilities[i] == hwcap)