From 3c3b014d3682252dbc133a6d2cd5dd2f8a028bbe Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx-pkg@fobos.de>
Date: Fri, 22 Apr 2011 11:24:51 +0200
Subject: Imported Upstream version 4.0.6-dfsg

---
 src/VBox/Main/src-server/linux/USBGetDevices.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'src/VBox/Main/src-server/linux/USBGetDevices.cpp')

diff --git a/src/VBox/Main/src-server/linux/USBGetDevices.cpp b/src/VBox/Main/src-server/linux/USBGetDevices.cpp
index 70bb7cd9a..b2e2b70b3 100644
--- a/src/VBox/Main/src-server/linux/USBGetDevices.cpp
+++ b/src/VBox/Main/src-server/linux/USBGetDevices.cpp
@@ -99,10 +99,8 @@ static const USBSUFF s_aIntervalSuff[] =
  */
 static const USBDEVTREELOCATION s_aTreeLocations[] =
 {
-    { "/proc/bus/usb", false },
-    { "/dev/bus/usb",  false },
     { "/dev/vboxusb",  true },
-    { "/dev/bus/usb",  true },
+    { "/proc/bus/usb", false },
 };
 
 
@@ -1444,17 +1442,7 @@ PCUSBDEVTREELOCATION USBProxyLinuxGetDeviceRoot(bool fPreferSysfs)
             if (   fHaveInotify
                 && !pcBestSysfs
                 && RTPathExists(s_aTreeLocations[i].szDevicesRoot))
-            {
-                PUSBDEVICE pDevices;
-
-                pDevices = getDevicesFromSysfs(s_aTreeLocations[i].szDevicesRoot,
-                                               true);
-                if (pDevices)
-                {
-                    pcBestSysfs = &s_aTreeLocations[i];
-                    deviceListFree(&pDevices);
-                }
-            }
+                pcBestSysfs = &s_aTreeLocations[i];
         }
     if (pcBestUsbfs && !fPreferSysfs)
         return pcBestUsbfs;
-- 
cgit v1.2.3