From patchwork Sun Oct 31 13:40:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 293572 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9VErBR0029203 for ; Sun, 31 Oct 2010 14:53:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755935Ab0JaOxJ (ORCPT ); Sun, 31 Oct 2010 10:53:09 -0400 Received: from queueout02-winn.ispmail.ntl.com ([81.103.221.56]:51710 "EHLO queueout02-winn.ispmail.ntl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755733Ab0JaOxJ (ORCPT ); Sun, 31 Oct 2010 10:53:09 -0400 Received: from aamtaout03-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout03-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20101031134015.FDGI3075.mtaout03-winn.ispmail.ntl.com@aamtaout03-winn.ispmail.ntl.com>; Sun, 31 Oct 2010 13:40:15 +0000 Received: from zog.reactivated.net ([86.14.215.141]) by aamtaout03-winn.ispmail.ntl.com (InterMail vG.3.00.04.00 201-2196-133-20080908) with ESMTP id <20101031134015.YKCO28282.aamtaout03-winn.ispmail.ntl.com@zog.reactivated.net>; Sun, 31 Oct 2010 13:40:15 +0000 Received: by zog.reactivated.net (Postfix, from userid 1000) id F21FF9D401B; Sun, 31 Oct 2010 13:40:12 +0000 (GMT) From: Daniel Drake To: linville@tuxdriver.com Cc: dcbw@redhat.com Cc: linux-wireless@vger.kernel.org Cc: libertas-dev@lists.infradead.org Cc: akarwar@marvell.com Subject: [PATCH] libertas: don't block usb8388 suspend if no wakeup conditions are set Message-Id: <20101031134012.F21FF9D401B@zog.reactivated.net> Date: Sun, 31 Oct 2010 13:40:12 +0000 (GMT) X-Cloudmark-Analysis: v=1.1 cv=3ENABmdyEd/Fm7fR7+mZIuMDn6+IErAeEhlfWBImZFk= c=1 sm=0 a=kpHxV6t7GfcA:10 a=Op-mwl0xAAAA:8 a=nSGpTEJqYWKkdCM5OvAA:9 a=DoECVEutNYSFXvWV9DAA:7 a=qd7tu06t-vCunB71mpF-CoG1H0QA:4 a=d4CUUju0HPYA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 31 Oct 2010 14:53:11 +0000 (UTC) diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index efaf850..35931cf 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -1090,12 +1090,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) if (priv->psstate != PS_STATE_FULL_POWER) return -1; - if (priv->wol_criteria == EHS_REMOVE_WAKEUP) { - lbs_pr_info("Suspend attempt without " - "configuring wake params!\n"); - return -ENOSYS; - } - ret = lbs_suspend(priv); if (ret) goto out;