git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
hif_usb.c
diff --git
a/drivers/net/wireless/ath/ath9k/hif_usb.c
b/drivers/net/wireless/ath/ath9k/hif_usb.c
index
f1b8af6
..
2d10239
100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/
drivers/net/wireless/ath/ath9k/hif_usb.c
@@
-1040,7
+1040,7
@@
static int ath9k_hif_usb_probe(struct usb_interface *interface,
}
ret = ath9k_htc_hw_init(hif_dev->htc_handle,
}
ret = ath9k_htc_hw_init(hif_dev->htc_handle,
- &
hif_dev->udev
->dev, hif_dev->device_id,
+ &
interface
->dev, hif_dev->device_id,
hif_dev->udev->product, id->driver_info);
if (ret) {
ret = -EINVAL;
hif_dev->udev->product, id->driver_info);
if (ret) {
ret = -EINVAL;
@@
-1158,7
+1158,7
@@
fail_resume:
#endif
static struct usb_driver ath9k_hif_usb_driver = {
#endif
static struct usb_driver ath9k_hif_usb_driver = {
- .name =
"ath9k_hif_usb"
,
+ .name =
KBUILD_MODNAME
,
.probe = ath9k_hif_usb_probe,
.disconnect = ath9k_hif_usb_disconnect,
#ifdef CONFIG_PM
.probe = ath9k_hif_usb_probe,
.disconnect = ath9k_hif_usb_disconnect,
#ifdef CONFIG_PM