From patchwork Thu Feb 25 11:03:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 81965 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1PB3doH027751 for ; Thu, 25 Feb 2010 11:03:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753619Ab0BYLDi (ORCPT ); Thu, 25 Feb 2010 06:03:38 -0500 Received: from mail-fx0-f219.google.com ([209.85.220.219]:47620 "EHLO mail-fx0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752083Ab0BYLDh (ORCPT ); Thu, 25 Feb 2010 06:03:37 -0500 Received: by fxm19 with SMTP id 19so6102184fxm.21 for ; Thu, 25 Feb 2010 03:03:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:mime-version:content-type:content-transfer-encoding :message-id; bh=CP1dG567o+2ZNZtd9FB+GaCDRsppMhawKRJA+3usJmQ=; b=tqmFFzqmSebjgT/tPXg9G1ao/KKV15ORsHXhv8aaBRkNs1FHdzjAkPnvH45MI1PFPB hzZCyA0+hMEkedY7DWF2gLVERW9ppuyJapBCqeHYZ9/7bsfCQJGYeLrcOoNw7x+PqTeu noXamAUvlaoGPTPU2KzUZ/5m0PqA8rdmIpi+g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:message-id; b=w1RnsiltbyeNymaD4xWWW8tB/3exTskII6sPbr+PvST2eSU0uUQcOx+rPdGOPzdH7G gS4qu416LpeEM9ZSUhw0NwYYkh4AuvLSFBq7HMaLujkrmAWN4Fmwj8zC3hVoeaOOGUF3 bL23bY0FEy0GFJcu+xIL0MwCbdM3ZydmZEXZ4= Received: by 10.223.127.201 with SMTP id h9mr983422fas.56.1267095816434; Thu, 25 Feb 2010 03:03:36 -0800 (PST) Received: from helmutmobil2.localnet (p5495EC76.dip.t-dialin.net [84.149.236.118]) by mx.google.com with ESMTPS id p17sm1155324fka.9.2010.02.25.03.03.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 25 Feb 2010 03:03:35 -0800 (PST) From: Helmut Schaa To: "Luis R. Rodriguez" Subject: [PATCH] ath_hif_usb: don't oops if fw not found Date: Thu, 25 Feb 2010 12:03:33 +0100 User-Agent: KMail/1.13.0 (Linux/2.6.33-rc8-wl-default; KDE/4.4.0; x86_64; ; ) Cc: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org MIME-Version: 1.0 Message-Id: <201002251203.33410.helmut.schaa@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 (demeter.kernel.org [140.211.167.41]); Thu, 25 Feb 2010 11:03:39 +0000 (UTC) diff --git a/ath/ath9k/ath_hif_usb.c b/ath/ath9k/ath_hif_usb.c index 481dc67..9ee74c0 100644 --- a/ath/ath9k/ath_hif_usb.c +++ b/ath/ath9k/ath_hif_usb.c @@ -898,6 +898,8 @@ static int hif_init_dev(struct hif_device_usb *hif_dev, const char *fw_name) { int r; + init_usb_anchor(&hif_dev->rx_submitted); + r = request_firmware(&hif_dev->firmware, fw_name, &hif_dev->udev->dev); if (r) { dev_err(&hif_dev->udev->dev, "ath_hif_usb: firmware " @@ -905,8 +907,6 @@ static int hif_init_dev(struct hif_device_usb *hif_dev, const char *fw_name) goto out; } - init_usb_anchor(&hif_dev->rx_submitted); - if (ar9271_alloc_urbs(hif_dev)) goto fail_urbs;