From patchwork Fri Jul 16 16:50:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 112472 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 o6GGoxnn018158 for ; Fri, 16 Jul 2010 16:50:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752681Ab0GPQua (ORCPT ); Fri, 16 Jul 2010 12:50:30 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:55697 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751526Ab0GPQu2 (ORCPT ); Fri, 16 Jul 2010 12:50:28 -0400 Received: by pvc7 with SMTP id 7so868734pvc.19 for ; Fri, 16 Jul 2010 09:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer; bh=tO8XMywuS3mOz3wz0r+0l1BnLLdntRSWJ2RuQHkYrtk=; b=I+iJVsbicjN5goSQdo5H5TlzBK2TWkgPpYifdrWbZhVnhInFEBTWKU/nXC9QUG0Oc/ AmUDxSdb/zOXqhtGQIl85NtjEUq/1gfs133ZZtkxIiBzQ/X6QXd5ze3LWo4F9wfGDM73 9Q0+VDHFKqj72++MTueuwCtzowOd5lUwF5rfE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=QZy7HPd5g4F8Eg1xkuAfXfdwIrm/0c7j8I33JrxsuI3BBdTMXryxapQgUANz0toPWl URQIi+tgs+uvZ/2TuyWypq3oUna4N+bRZ7Qs+3mx1lZziQeY+ylCcnJn+kGCAvNNE5p0 CgNnoZenT+UdBgMtkNijvFdKD8IoI7wBGR67I= Received: by 10.142.174.4 with SMTP id w4mr1291105wfe.163.1279299017617; Fri, 16 Jul 2010 09:50:17 -0700 (PDT) Received: from earth ([75.85.182.25]) by mx.google.com with ESMTPS id f2sm2810316wfp.23.2010.07.16.09.50.14 (version=SSLv3 cipher=RC4-MD5); Fri, 16 Jul 2010 09:50:16 -0700 (PDT) Received: by earth (sSMTP sendmail emulation); Fri, 16 Jul 2010 09:50:10 -0700 From: Stephen Boyd To: users@rt2x00.serialmonkey.com Cc: Ivo van Doorn , "John W. Linville" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rt2x00: Fix lockdep warning in rt2x00lib_probe_dev() Date: Fri, 16 Jul 2010 09:50:10 -0700 Message-Id: <1279299010-4723-1-git-send-email-bebarino@gmail.com> X-Mailer: git-send-email 1.7.2.rc2.10.g637ab 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]); Fri, 16 Jul 2010 16:51:35 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 3ae468c..f20d3ee 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -854,6 +854,11 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) BIT(NL80211_IFTYPE_WDS); /* + * Initialize configuration work. + */ + INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled); + + /* * Let the driver probe the device to detect the capabilities. */ retval = rt2x00dev->ops->lib->probe_hw(rt2x00dev); @@ -863,11 +868,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) } /* - * Initialize configuration work. - */ - INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled); - - /* * Allocate queue array. */ retval = rt2x00queue_allocate(rt2x00dev);