diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 4b155427..23d9ead7 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -90,7 +90,7 @@ function running_as_root {
 }
 
 function reset_usb_devices {
-    for xhci in /sys/bus/pci/drivers/?hci_hcd ; do
+    for xhci in /sys/bus/pci/drivers/?hci-pci ; do
 
         if ! cd $xhci ; then
             return
diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi
index c856c86c..7d67c75d 100755
--- a/src/freedombone-utils-wifi
+++ b/src/freedombone-utils-wifi
@@ -66,8 +66,8 @@ function setup_wifi_atheros {
     curr_dir=$(pwd)
     cd /lib/firmware
     tar -xzvf $atheros_drivers_file
-    cd $curr_dir
     reset_usb_devices
+    cd $curr_dir
 }
 
 function setup_wifi {