From patchwork Mon Oct 12 12:08:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luciano Coelho X-Patchwork-Id: 53120 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9CCTovd000566 for ; Mon, 12 Oct 2009 12:29:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755087AbZJLMTM (ORCPT ); Mon, 12 Oct 2009 08:19:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755061AbZJLMTM (ORCPT ); Mon, 12 Oct 2009 08:19:12 -0400 Received: from smtp.nokia.com ([192.100.122.230]:52664 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754846AbZJLMTL (ORCPT ); Mon, 12 Oct 2009 08:19:11 -0400 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n9CCHDIP010672; Mon, 12 Oct 2009 15:17:39 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 12 Oct 2009 15:17:36 +0300 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 12 Oct 2009 15:09:15 +0300 Received: from localhost.localdomain (pimenta.research.nokia.com [172.21.50.90]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n9CC8vIH011869; Mon, 12 Oct 2009 15:09:12 +0300 From: Luciano Coelho To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Juuso Oikarinen Subject: [PATCH 10/16] wl1271: Enable ELP Date: Mon, 12 Oct 2009 15:08:51 +0300 Message-Id: <1255349337-9776-11-git-send-email-luciano.coelho@nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1255349337-9776-1-git-send-email-luciano.coelho@nokia.com> References: <1255349337-9776-1-git-send-email-luciano.coelho@nokia.com> X-OriginalArrivalTime: 12 Oct 2009 12:09:15.0556 (UTC) FILETIME=[D1503E40:01CA4B34] X-Nokia-AV: Clean Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.c b/drivers/net/wireless/wl12xx/wl1271_ps.c index 5580e53..fb821c9 100644 --- a/drivers/net/wireless/wl12xx/wl1271_ps.c +++ b/drivers/net/wireless/wl12xx/wl1271_ps.c @@ -39,12 +39,7 @@ void wl1271_elp_work(struct work_struct *work) mutex_lock(&wl->mutex); - /* - * FIXME: below, by means of the "true", ELP has been disabled for now - * to work around a firmware bug. To be enabled upon receiving a new - * firmware version. - */ - if (true || wl->elp || !wl->psm) + if (wl->elp || !wl->psm) goto out; wl1271_debug(DEBUG_PSM, "chip to elp");