From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756101Ab0CHXm0 (ORCPT ); Mon, 8 Mar 2010 18:42:26 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:56084 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756053Ab0CHXmX (ORCPT ); Mon, 8 Mar 2010 18:42:23 -0500 Date: Tue, 9 Mar 2010 10:42:21 +1100 From: Stephen Rothwell To: David Miller , Cc: "John W. Linville" , LKML , linux-next@vger.kernel.org Subject: [PATCH] ar9170: fix for driver-core ABI change Message-Id: <20100309104221.aedc5e7e.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.0 (GTK+ 2.18.7; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Stephen Rothwell --- drivers/net/wireless/ath/ar9170/usb.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Hi Dave, I have been carrying this patch in linux-next for some time as a fixup for the driver-core tree. It is now needed in net-2.6 (i.e. my net-current) (since you merged the wireless tree) *after* you merge with Linus' tree i.e. the down()/up() are present in the net-2.6 tree and the changes to the driver core to use mutexes are in Linus' tree. diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index 4e30197..7fc1034 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include "ar9170.h" #include "cmd.h" @@ -726,10 +727,10 @@ static void ar9170_usb_firmware_failed(struct ar9170_usb *aru) /* unbind anything failed */ if (parent) - down(&parent->sem); + device_lock(parent); device_release_driver(&aru->udev->dev); if (parent) - up(&parent->sem); + device_unlock(parent); } static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context) -- 1.7.0 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/