From patchwork Wed Jul 21 17:33:54 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ohad Ben Cohen <ohad@wizery.com>
X-Patchwork-Id: 113434
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6LHZpHu008411
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 21 Jul 2010 17:35:51 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1761171Ab0GURfg (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 21 Jul 2010 13:35:36 -0400
Received: from mail-bw0-f46.google.com ([209.85.214.46]:59315 "EHLO
	mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1761148Ab0GURfc (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Wed, 21 Jul 2010 13:35:32 -0400
Received: by mail-bw0-f46.google.com with SMTP id 1so374531bwz.19
	for <multiple recipients>; Wed, 21 Jul 2010 10:35:31 -0700 (PDT)
Received: by 10.204.19.83 with SMTP id z19mr417518bka.43.1279733731055;
	Wed, 21 Jul 2010 10:35:31 -0700 (PDT)
Received: from localhost.localdomain (93-172-119-238.bb.netvision.net.il
	[93.172.119.238]) by mx.google.com with ESMTPS id
	f10sm29348743bkl.5.2010.07.21.10.35.28
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Wed, 21 Jul 2010 10:35:30 -0700 (PDT)
From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
	<linux-omap@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>, <linux@arm.linux.org.uk>,
	Chikkature Rajashekar Madhusudhan <madhu.cr@ti.com>,
	Luciano Coelho <luciano.coelho@nokia.com>, <akpm@linux-foundation.org>,
	San Mehat <san@google.com>, Roger Quadros <roger.quadros@nokia.com>,
	Tony Lindgren <tony@atomide.com>, Nicolas Pitre <nico@fluxnic.net>,
	Pandita Vikram <vikram.pandita@ti.com>, Kalle Valo <kalle.valo@iki.fi>,
	Ohad Ben-Cohen <ohad@wizery.com>
Subject: [PATCH v2 20/20] wireless: wl1271: call SDIO claim/release power API
Date: Wed, 21 Jul 2010 20:33:54 +0300
Message-Id: <1279733634-21974-21-git-send-email-ohad@wizery.com>
X-Mailer: git-send-email 1.7.0.4
In-Reply-To: <1279733634-21974-1-git-send-email-ohad@wizery.com>
References: <1279733634-21974-1-git-send-email-ohad@wizery.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 21 Jul 2010 17:35:51 +0000 (UTC)


diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index 5967718..a7e9ace 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -152,11 +152,13 @@ static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
 	 * alive.
 	 */
 	if (enable) {
+		sdio_claim_power(func);
 		sdio_claim_host(func);
 		sdio_enable_func(func);
 	} else {
 		sdio_disable_func(func);
 		sdio_release_host(func);
+		sdio_release_power(func);
 	}
 
 	return 0;