Return-path: Received: from mail.atheros.com ([12.36.123.2]:30977 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754793Ab0FXLBP (ORCPT ); Thu, 24 Jun 2010 07:01:15 -0400 Received: from mail.atheros.com ([10.10.20.108]) by sidewinder.atheros.com for ; Thu, 24 Jun 2010 04:01:15 -0700 Date: Thu, 24 Jun 2010 16:31:08 +0530 From: Vasanthakumar Thiagarajan To: "linville@tuxdriver.com" CC: "linux-wireless@vger.kernel.org" Subject: Re: [PATCH 2/3] ath9k: Restore ps state in ath_paprd_calibrate() upon failure to allocate skb Message-ID: <20100624110107.GA6339@vasanth-laptop> References: <1277372566-22883-1-git-send-email-vasanth@atheros.com> <1277372566-22883-2-git-send-email-vasanth@atheros.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" In-Reply-To: <1277372566-22883-2-git-send-email-vasanth@atheros.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, Jun 24, 2010 at 03:12:45PM +0530, Vasanthakumar Thiagarajan wrote: > Signed-off-by: Vasanthakumar Thiagarajan > --- > drivers/net/wireless/ath/ath9k/main.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c > index 6d57877..484d113 100644 > --- a/drivers/net/wireless/ath/ath9k/main.c > +++ b/drivers/net/wireless/ath/ath9k/main.c > @@ -271,7 +271,7 @@ void ath_paprd_calibrate(struct work_struct *work) > ath9k_ps_wakeup(sc); > skb = alloc_skb(len, GFP_KERNEL); > if (!skb) > - return; > + goto fail_paprd; > > tx_info = IEEE80211_SKB_CB(skb); Please drop this particular patch, ath9k_ps_wakeup() does not need to be there before alloc_skb() in the first place. I'll send a cleaner one. Vasanth