fix return status handling by ar5XXXReset; this is the reason the

driver sometimes reports reset failed w/ status 0
This commit is contained in:
sam 2009-01-23 05:33:48 +00:00
parent f5721f3a13
commit d0356507a2
5 changed files with 10 additions and 10 deletions

View File

@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: ar5210_reset.c,v 1.8 2008/11/11 17:25:16 sam Exp $
* $FreeBSD$
*/
#include "opt_ah.h"
@ -296,7 +296,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMODE opmode,
return AH_TRUE;
bad:
if (*status)
if (status != AH_NULL)
*status = ecode;
return AH_FALSE;
#undef FAIL

View File

@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: ar5211_reset.c,v 1.9 2008/11/27 22:29:52 sam Exp $
* $FreeBSD$
*/
#include "opt_ah.h"
@ -552,7 +552,7 @@ uint32_t softLedCfg, softLedState;
return AH_TRUE;
bad:
if (*status)
if (status != AH_NULL)
*status = ecode;
return AH_FALSE;
#undef FAIL

View File

@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: ar5212_reset.c,v 1.20 2008/11/27 22:30:00 sam Exp $
* $FreeBSD$
*/
#include "opt_ah.h"
@ -692,7 +692,7 @@ ar5212Reset(struct ath_hal *ah, HAL_OPMODE opmode,
RESTORE_CCK(ah, chan, isBmode);
OS_MARK(ah, AH_MARK_RESET_DONE, ecode);
if (*status)
if (status != AH_NULL)
*status = ecode;
return AH_FALSE;
#undef FAIL

View File

@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: ar5312_reset.c,v 1.10 2008/11/22 07:41:37 sam Exp $
* $FreeBSD$
*/
#include "opt_ah.h"
@ -597,7 +597,7 @@ ar5312Reset(struct ath_hal *ah, HAL_OPMODE opmode,
return AH_TRUE;
bad:
OS_MARK(ah, AH_MARK_RESET_DONE, ecode);
if (*status)
if (status != AH_NULL)
*status = ecode;
return AH_FALSE;
#undef FAIL

View File

@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: ar5416_reset.c,v 1.27 2008/11/27 22:30:08 sam Exp $
* $FreeBSD$
*/
#include "opt_ah.h"
@ -470,7 +470,7 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMODE opmode,
return AH_TRUE;
bad:
OS_MARK(ah, AH_MARK_RESET_DONE, ecode);
if (*status)
if (status != AH_NULL)
*status = ecode;
return AH_FALSE;
#undef FAIL