diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-03 17:08:11 +1100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:26:49 -0400 |
| commit | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (patch) | |
| tree | 434462b6f8f4ba80884738c3f8bc42dcb8f3b47a | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem (diff) | |
| download | linux-dev-5a147e8bf982f9dd414c1dd751fe02c1942506b2.tar.xz linux-dev-5a147e8bf982f9dd414c1dd751fe02c1942506b2.zip | |
ar9170: fix for driver-core ABI change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ar9170/usb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index c1c7c427501c..c8121a6a9d3a 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c @@ -42,6 +42,7 @@ #include <linux/usb.h> #include <linux/firmware.h> #include <linux/etherdevice.h> +#include <linux/device.h> #include <net/mac80211.h> #include "ar9170.h" #include "cmd.h" @@ -739,10 +740,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) |