sys/v4l/gstv4lelement.c: Reprobe devices again instead of taking a cached list as...

Original commit message from CVS:
Patch by: Mike Ruprecht <cmaiku at gmail dot com>
* sys/v4l/gstv4lelement.c: (gst_v4l_class_probe_devices):
Reprobe devices again instead of taking a cached list as new
devices could've been plugged in. Fixes bug #549062.

diff --git a/ChangeLog b/ChangeLog
index 993599d5a4df68d5d7137f3273b69fe52b89c30b..20312f8bd152cfe024dfb159f271922ebb025c7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-23  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+       Patch by: Mike Ruprecht <cmaiku at gmail dot com>
+
+       * sys/v4l/gstv4lelement.c: (gst_v4l_class_probe_devices):
+       Reprobe devices again instead of taking a cached list as new
+       devices could've been plugged in. Fixes bug #549062.
+
 2008-08-23  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        Patch by: Alessandro Dessina <alessandro nnva org>

diff --git a/sys/v4l/gstv4lelement.c b/sys/v4l/gstv4lelement.c
index cdd3ebbd8eda29c2b3cd194228c5ed69f2ec065d..1bacb6433d7000828f82c4a45be1f490cb64a030 100644 (file)
--- a/sys/v4l/gstv4lelement.c
+++ b/sys/v4l/gstv4lelement.c
@@ -114,7 +114,7 @@ gst_v4l_class_probe_devices (GstV4lElementClass * klass, gboolean check)
   static gboolean init = FALSE;
   static GList *devices = NULL;
 
-  if (!init && !check) {
+  if (!check) {
     gchar *dev_base[] = { "/dev/video", "/dev/v4l/video", NULL };
     gint base, n, fd;
 
@@ -122,7 +122,7 @@ gst_v4l_class_probe_devices (GstV4lElementClass * klass, gboolean check)
       GList *item = devices;
       gchar *device = item->data;
 
-      devices = g_list_remove (devices, item);
+      devices = g_list_remove (devices, device);
       g_free (device);
     }