diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-14 13:16:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-14 13:16:51 -0700 |
| commit | dd5030404695d81792a21cba575e02b21a2f275a (patch) | |
| tree | 3444db9d86b9a9c325066fd5fd2bc62397f1a04a /drivers/net/wireless/ath/ath9k/hif_usb.c | |
| parent | 38a2f37258f9e2ae3f6e4241e01088be8dfaf4e9 (diff) | |
| parent | 332704a51498a7e29aa92c19dc03f11f80b71bfe (diff) | |
| download | op-kernel-dev-dd5030404695d81792a21cba575e02b21a2f275a.zip op-kernel-dev-dd5030404695d81792a21cba575e02b21a2f275a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hif_usb.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hif_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index f1b8af6..2d10239 100644 --- 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, - &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; @@ -1158,7 +1158,7 @@ fail_resume: #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 |
