thodg/cgminer

diff --git a/driver-modminer.c b/driver-modminer.c
index 581016e..67a5b95 100644
--- a/driver-modminer.c
+++ b/driver-modminer.c
@@ -214,7 +214,7 @@ static bool modminer_detect_one(struct libusb_device *dev, struct usb_find_devic
 		added = true;
 	}
 
-	modminer = usb_free_cgpu(modminer);
+	modminer = usb_free_cgpu_devlock(modminer, !added);
 
 	return true;
 
diff --git a/usbutils.c b/usbutils.c
index d43e34c..f036ea4 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -1401,7 +1401,7 @@ struct cgpu_info *usb_copy_cgpu(struct cgpu_info *orig)
 
 	memcpy(&(copy->usbinfo), &(orig->usbinfo), sizeof(copy->usbinfo));
 
-	copy->usbinfo.nodev = (copy->usbdev != NULL);
+	copy->usbinfo.nodev = (copy->usbdev == NULL);
 
 	copy->usbinfo.devlock = orig->usbinfo.devlock;