From c7e89d852d512eefb2c6bf1869dc5312e3153e66 Mon Sep 17 00:00:00 2001 From: Bob Copeland Date: Mon, 24 Jan 2011 23:31:43 -0500 Subject: [PATCH] --- yaml --- r: 232861 b: refs/heads/master c: 15411c27d203e363592d30ab00803254ebe77b90 h: refs/heads/master i: 232859: 9e97342086550ff0eae5255629f14266ed4ae26c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/dma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86ee0298d2eb..902f48d0e3e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc5892c9ec250b36c9287bd52a74d08d75a40152 +refs/heads/master: 15411c27d203e363592d30ab00803254ebe77b90 diff --git a/trunk/drivers/net/wireless/ath/ath5k/dma.c b/trunk/drivers/net/wireless/ath/ath5k/dma.c index 0064be7ce5c9..21091c26a9a5 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/dma.c +++ b/trunk/drivers/net/wireless/ath/ath5k/dma.c @@ -838,9 +838,9 @@ int ath5k_hw_dma_stop(struct ath5k_hw *ah) for (i = 0; i < qmax; i++) { err = ath5k_hw_stop_tx_dma(ah, i); /* -EINVAL -> queue inactive */ - if (err != -EINVAL) + if (err && err != -EINVAL) return err; } - return err; + return 0; }