diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-07-26 17:05:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-26 17:05:55 -0400 |
commit | e5036c2575b244851637a81efc4104c076c4fa21 (patch) | |
tree | 5d8d5dd0a768b77bda3299ea565c7444c26ed6f1 /drivers | |
parent | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (diff) | |
parent | 5bc91db8933bce07c3af86da2bd956414aa5a725 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43/bus.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43/main.c | 5 | ||||
-rw-r--r-- | drivers/nfc/pn533.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index d2293dcc117f..3cab843afb05 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig | |||
@@ -28,7 +28,7 @@ config B43 | |||
28 | 28 | ||
29 | config B43_BCMA | 29 | config B43_BCMA |
30 | bool "Support for BCMA bus" | 30 | bool "Support for BCMA bus" |
31 | depends on B43 && BCMA && BROKEN | 31 | depends on B43 && BCMA |
32 | default y | 32 | default y |
33 | 33 | ||
34 | config B43_SSB | 34 | config B43_SSB |
diff --git a/drivers/net/wireless/b43/bus.c b/drivers/net/wireless/b43/bus.c index 64c3f65ff8c0..05f6c7bff6ab 100644 --- a/drivers/net/wireless/b43/bus.c +++ b/drivers/net/wireless/b43/bus.c | |||
@@ -244,10 +244,12 @@ void b43_bus_set_wldev(struct b43_bus_dev *dev, void *wldev) | |||
244 | #ifdef CONFIG_B43_BCMA | 244 | #ifdef CONFIG_B43_BCMA |
245 | case B43_BUS_BCMA: | 245 | case B43_BUS_BCMA: |
246 | bcma_set_drvdata(dev->bdev, wldev); | 246 | bcma_set_drvdata(dev->bdev, wldev); |
247 | break; | ||
247 | #endif | 248 | #endif |
248 | #ifdef CONFIG_B43_SSB | 249 | #ifdef CONFIG_B43_SSB |
249 | case B43_BUS_SSB: | 250 | case B43_BUS_SSB: |
250 | ssb_set_drvdata(dev->sdev, wldev); | 251 | ssb_set_drvdata(dev->sdev, wldev); |
252 | break; | ||
251 | #endif | 253 | #endif |
252 | } | 254 | } |
253 | } | 255 | } |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 73fbf0358f96..a92cde8d2839 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -5350,6 +5350,7 @@ static void b43_ssb_remove(struct ssb_device *sdev) | |||
5350 | { | 5350 | { |
5351 | struct b43_wl *wl = ssb_get_devtypedata(sdev); | 5351 | struct b43_wl *wl = ssb_get_devtypedata(sdev); |
5352 | struct b43_wldev *wldev = ssb_get_drvdata(sdev); | 5352 | struct b43_wldev *wldev = ssb_get_drvdata(sdev); |
5353 | struct b43_bus_dev *dev = wldev->dev; | ||
5353 | 5354 | ||
5354 | /* We must cancel any work here before unregistering from ieee80211, | 5355 | /* We must cancel any work here before unregistering from ieee80211, |
5355 | * as the ieee80211 unreg will destroy the workqueue. */ | 5356 | * as the ieee80211 unreg will destroy the workqueue. */ |
@@ -5365,14 +5366,14 @@ static void b43_ssb_remove(struct ssb_device *sdev) | |||
5365 | ieee80211_unregister_hw(wl->hw); | 5366 | ieee80211_unregister_hw(wl->hw); |
5366 | } | 5367 | } |
5367 | 5368 | ||
5368 | b43_one_core_detach(wldev->dev); | 5369 | b43_one_core_detach(dev); |
5369 | 5370 | ||
5370 | if (list_empty(&wl->devlist)) { | 5371 | if (list_empty(&wl->devlist)) { |
5371 | b43_leds_unregister(wl); | 5372 | b43_leds_unregister(wl); |
5372 | /* Last core on the chip unregistered. | 5373 | /* Last core on the chip unregistered. |
5373 | * We can destroy common struct b43_wl. | 5374 | * We can destroy common struct b43_wl. |
5374 | */ | 5375 | */ |
5375 | b43_wireless_exit(wldev->dev, wl); | 5376 | b43_wireless_exit(dev, wl); |
5376 | } | 5377 | } |
5377 | } | 5378 | } |
5378 | 5379 | ||
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index 037231540719..c77e0543e502 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c | |||
@@ -1596,7 +1596,7 @@ static void pn533_disconnect(struct usb_interface *interface) | |||
1596 | usb_free_urb(dev->out_urb); | 1596 | usb_free_urb(dev->out_urb); |
1597 | kfree(dev); | 1597 | kfree(dev); |
1598 | 1598 | ||
1599 | nfc_dev_info(&dev->interface->dev, "NXP PN533 NFC device disconnected"); | 1599 | nfc_dev_info(&interface->dev, "NXP PN533 NFC device disconnected"); |
1600 | } | 1600 | } |
1601 | 1601 | ||
1602 | static struct usb_driver pn533_driver = { | 1602 | static struct usb_driver pn533_driver = { |