xnu-2782.20.48.tar.gz

[apple/xnu.git] / iokit / Kernel / IOMultiMemoryDescriptor.cpp

diff --git a/iokit/Kernel/IOMultiMemoryDescriptor.cpp b/iokit/Kernel/IOMultiMemoryDescriptor.cpp
index 262680dc8a4bd21055fd967d2f2f30a388af1521..6d209ab1f9c878f2b81e4d90daf632a2dac880c3 100644 (file)
--- a/iokit/Kernel/IOMultiMemoryDescriptor.cpp
+++ b/iokit/Kernel/IOMultiMemoryDescriptor.cpp
@@ -76,7 +76,6 @@ bool IOMultiMemoryDescriptor::initWithDescriptors(
     //
 
     assert(descriptors);
     //
 
     assert(descriptors);

-    assert(withCount);

 
     // Release existing descriptors, if any
     if ( _descriptors )
 
     // Release existing descriptors, if any
     if ( _descriptors )


@@ -123,7 +122,8 @@ bool IOMultiMemoryDescriptor::initWithDescriptors(
         descriptors[index]->retain();
         _length += descriptors[index]->getLength();
         if ( _tag == 0 )  _tag = descriptors[index]->getTag();
         descriptors[index]->retain();
         _length += descriptors[index]->getLength();
         if ( _tag == 0 )  _tag = descriptors[index]->getTag();

-        assert(descriptors[index]->getDirection() == withDirection);
+        assert(descriptors[index]->getDirection() ==
+              (withDirection & kIOMemoryDirectionMask));

     }
 
     return true;
     }
 
     return true;