diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-03 01:08:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:26:49 -0400 |
commit | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (patch) | |
tree | 434462b6f8f4ba80884738c3f8bc42dcb8f3b47a | |
parent | cc755896a4274f11283bca32d1d658203844057a (diff) |
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 @@ | |||
42 | #include <linux/usb.h> | 42 | #include <linux/usb.h> |
43 | #include <linux/firmware.h> | 43 | #include <linux/firmware.h> |
44 | #include <linux/etherdevice.h> | 44 | #include <linux/etherdevice.h> |
45 | #include <linux/device.h> | ||
45 | #include <net/mac80211.h> | 46 | #include <net/mac80211.h> |
46 | #include "ar9170.h" | 47 | #include "ar9170.h" |
47 | #include "cmd.h" | 48 | #include "cmd.h" |
@@ -739,10 +740,10 @@ static void ar9170_usb_firmware_failed(struct ar9170_usb *aru) | |||
739 | 740 | ||
740 | /* unbind anything failed */ | 741 | /* unbind anything failed */ |
741 | if (parent) | 742 | if (parent) |
742 | down(&parent->sem); | 743 | device_lock(parent); |
743 | device_release_driver(&aru->udev->dev); | 744 | device_release_driver(&aru->udev->dev); |
744 | if (parent) | 745 | if (parent) |
745 | up(&parent->sem); | 746 | device_unlock(parent); |
746 | } | 747 | } |
747 | 748 | ||
748 | static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context) | 749 | static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context) |