From: <tr...@ff...> - 2010-07-11 23:36:34
|
Author: jwoithe Date: 2010-07-11 16:36:26 -0700 (Sun, 11 Jul 2010) New Revision: 1867 Modified: trunk/libffado/src/libieee1394/IsoHandlerManager.cpp Log: Address a potential false error report from IsoHandlerManager::stopHandlers() when called from the IsoHandlerManager destructor after a user shutdown. Modified: trunk/libffado/src/libieee1394/IsoHandlerManager.cpp =================================================================== --- trunk/libffado/src/libieee1394/IsoHandlerManager.cpp 2010-07-10 13:42:33 UTC (rev 1866) +++ trunk/libffado/src/libieee1394/IsoHandlerManager.cpp 2010-07-11 23:36:26 UTC (rev 1867) @@ -1841,8 +1841,17 @@ IsoHandlerManager::IsoHandler::requestDisable() { if (m_State == eHS_Stopped) { - debugError("Disable requested on disabled stream\n"); - return false; + // Don't treat this as an error condition because during a user + // shutdown the stream would have been disabled by + // stopHandlerForStream(). Therefore when requestDisable() is + // subnsequently called by IsoHandlerManager::stopHandlers() in the + // IsoHandlerManager destructor with the stream disabled the + // condition is not an error. + // + // For now print a warning, but this might be removed in future if + // the above framework remains in place. + debugWarning("Disable requested on disabled stream\n"); + return true; } if (m_State != eHS_Running) { debugError("Disable requested on stream with state=%d\n", m_State); |