Address feedback and fix test.

Author: aarongreig

source/adapters/opencl/usm.cpp

@@ -358,7 +358,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMMemcpy(
                       sizeof(cl_device_id), &SrcDevice, nullptr));
   CL_RETURN_ON_FAILURE(
       GetMemAllocInfo(CLContext, pDst, CL_MEM_ALLOC_DEVICE_INTEL,
-                      sizeof(cl_device_id), &SrcDevice, nullptr));
+                      sizeof(cl_device_id), &DstDevice, nullptr));
 
   if ((SrcDevice && DstDevice) && SrcDevice != DstDevice) {
     cl_event HostCopyEvent = nullptr, FinalCopyEvent = nullptr;

test/conformance/enqueue/urEnqueueUSMMemcpy.cpp

@@ -207,12 +207,24 @@ struct urEnqueueUSMMemcpyMultiDeviceTest : uur::urAllDevicesTest {
     }
 
     void TearDown() override {
-        ASSERT_SUCCESS(urUSMFree(context, src_alloc));
-        ASSERT_SUCCESS(urUSMFree(context, dst_alloc));
-        ASSERT_SUCCESS(urUSMFree(context, host_alloc));
-        ASSERT_SUCCESS(urQueueRelease(src_queue));
-        ASSERT_SUCCESS(urQueueRelease(dst_queue));
-        ASSERT_SUCCESS(urContextRelease(context));
+        if (src_alloc) {
+            ASSERT_SUCCESS(urUSMFree(context, src_alloc));
+        }
+        if (dst_alloc) {
+            ASSERT_SUCCESS(urUSMFree(context, dst_alloc));
+        }
+        if (host_alloc) {
+            ASSERT_SUCCESS(urUSMFree(context, host_alloc));
+        }
+        if (src_queue) {
+            ASSERT_SUCCESS(urQueueRelease(src_queue));
+        }
+        if (dst_queue) {
+            ASSERT_SUCCESS(urQueueRelease(dst_queue));
+        }
+        if (context) {
+            ASSERT_SUCCESS(urContextRelease(context));
+        }
         uur::urAllDevicesTest::TearDown();
     }