--- driverkit/libDriver/Kernel/SCSIDisk.m	2018/04/24 17:37:51	1.1
+++ driverkit/libDriver/Kernel/SCSIDisk.m	2018/04/24 17:40:12	1.1.1.2
@@ -155,21 +155,25 @@ static Protocol *protocols[] = {
 					forParameter	: APPLE_MAX_THREADS
 					count		: &count];
 				if (ioReturn == IO_R_SUCCESS && count == 1) {
+#if 0 /* Radar 2291688: supress IOLog */
 				    IOLog("%s: %s requests %d threads\n",
 					[self name],
 					[controllerId name],
 					paramValue[0]
 				    );
+#endif
 				    [diskId initResourcesWithThreadCount
 						: paramValue[0]];
 				}
 				else {
+#if 0 /* Radar 2291688: supress IOLog */
 				    IOLog(
 		"%s: %s does not support %s selector, using default\n",
 					[self name],
 					[controllerId name],
 					APPLE_MAX_THREADS
 				    );
+#endif
 				    [diskId initResources];
 				}
 				[diskId setDevAndIdInfo:&(idMap[diskUnit])];
@@ -710,13 +714,13 @@ nextTarget:
     extern long int strtol(const char *nptr, char **endptr, int base);
 
     unitStr = [super matchDevicePath:matchPath];
-    if( unitStr) {
+    if( unitStr && (*unitStr == '/')) {
         unitStr = (char *)strchr( unitStr, '@');
         if( unitStr) {
             matches = ([self target] == strtol( unitStr + 1, &unitStr, 16));
             if( matches && (*unitStr == ','))
                 matches = ([self lun] == strtol( unitStr + 1, &unitStr, 16));
-	}
+        }
     }
     if( matches)
         return( unitStr);