fix device_lock/device_unlock imbalances