From patchwork Mon Nov 15 14:11:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 324992 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 oAFEBk1r003016 for ; Mon, 15 Nov 2010 14:11:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756770Ab0KOOLp (ORCPT ); Mon, 15 Nov 2010 09:11:45 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:46976 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755854Ab0KOOLo (ORCPT ); Mon, 15 Nov 2010 09:11:44 -0500 Received: by fxm6 with SMTP id 6so1748765fxm.19 for ; Mon, 15 Nov 2010 06:11:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:received:received :from:to:subject:date:user-agent:cc:mime-version:x-length:x-uid :content-type:content-transfer-encoding:message-id; bh=iWPxky0h/cgE85P22FWvV3lNIZewK9rVq02QiucWGik=; b=SIUy+nuBsC31quHxMlCfYvHM3Ig0DBlARGU9iRthhzyEVOqRTZbTehR5VkQNrOi2xt JNWmJW9Yy+fCa4ypRUldEjkFQWbQKwwC+sA0asvto02dt3Z98KW32+adHMCY0ghJHSqu v4zjBi7s5QQ/h2tCSw6exUBBTwzIc4ettAQ+U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:x-length:x-uid :content-type:content-transfer-encoding:message-id; b=UIJq+/oplNvIDNpLzoaZBGJfdZHCvP0LLelPMIFmmkkB28EPqGBjpv9VuYBaaTkzFA xyslOjF7alf4IdzYdNmXRv/U8Cpt5edqrq1YdKOoytPgiLqqlp0HRPgOE9LFIH1UQLyB 1WliRWBvNKKZ8PUB/GdOLK3i13G7xSw23t/fU= Received: by 10.223.114.135 with SMTP id e7mr1978814faq.78.1289830303565; Mon, 15 Nov 2010 06:11:43 -0800 (PST) Received: from blech.mobile (nat-wh.rz.uni-karlsruhe.de [129.13.72.197]) by mx.google.com with ESMTPS id r22sm861007fax.45.2010.11.15.06.11.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Nov 2010 06:11:42 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by blech.mobile (Postfix) with ESMTP id 7D8D33408D8; Mon, 15 Nov 2010 15:11:40 +0100 (CET) Received: from blech.mobile ([127.0.0.1]) by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e1HGxHpyu72j; Mon, 15 Nov 2010 15:11:27 +0100 (CET) Received: from blech.mobile (localhost [127.0.0.1]) by blech.mobile (Postfix) with ESMTP id E4D6134068A; Mon, 15 Nov 2010 15:11:26 +0100 (CET) From: Christian Lamparter To: linux-wireless@vger.kernel.org Subject: [PATCH for-2.6.37] carl9170: fix usb anchor wait timeout Date: Mon, 15 Nov 2010 15:11:26 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37-rc1-wl+; KDE/4.4.5; x86_64; ; ) Cc: linville@tuxdriver.com MIME-Version: 1.0 X-Length: 1509 X-UID: 77 Message-Id: <201011151511.26736.chunkeey@googlemail.com> 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]); Mon, 15 Nov 2010 14:11:47 +0000 (UTC) diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index 82c5f1c..a268053 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c @@ -556,1 +556,1 @@ static int carl9170_usb_flush(struct ar9170 *ar) - ret = usb_wait_anchor_empty_timeout(&ar->tx_cmd, HZ); + ret = usb_wait_anchor_empty_timeout(&ar->tx_cmd, 1000); @@ -561,1 +561,1 @@ static int carl9170_usb_flush(struct ar9170 *ar) - ret = usb_wait_anchor_empty_timeout(&ar->tx_anch, HZ); + ret = usb_wait_anchor_empty_timeout(&ar->tx_anch, 1000);