diff --git a/[refs] b/[refs] index aba7522dd554..c7b371a75f64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39d63f2a3f95dce96e65f88c0a4560c3ca857a5f +refs/heads/master: b16062facbf9952d9d69621a6bf87e1188973ccd diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.c b/trunk/drivers/net/wireless/ath/ath5k/base.c index 5479f85fcd35..d9df11490ab6 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/base.c +++ b/trunk/drivers/net/wireless/ath/ath5k/base.c @@ -1937,8 +1937,7 @@ ath5k_tasklet_rx(unsigned long data) else if (unlikely(ret)) { ATH5K_ERR(sc, "error in processing rx descriptor\n"); sc->stats.rxerr_proc++; - spin_unlock(&sc->rxbuflock); - return; + break; } sc->stats.rx_all_count++;