Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

5 files changed, 11 insertions, 7 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
 
 config B43_BCMA
         bool "Support for BCMA bus"
-        depends on B43 && BCMA && BROKEN
+        depends on B43 && BCMA
         default y
 
 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)
 #ifdef CONFIG_B43_BCMA
         case B43_BUS_BCMA:
                 bcma_set_drvdata(dev->bdev, wldev);
+                break;
 #endif
 #ifdef CONFIG_B43_SSB
         case B43_BUS_SSB:
                 ssb_set_drvdata(dev->sdev, wldev);
+                break;
 #endif
         }
 }
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)
 {
         struct b43_wl *wl = ssb_get_devtypedata(sdev);
         struct b43_wldev *wldev = ssb_get_drvdata(sdev);
+        struct b43_bus_dev *dev = wldev->dev;
 
         /* We must cancel any work here before unregistering from ieee80211,
          * as the ieee80211 unreg will destroy the workqueue. */
@@ -5365,14 +5366,14 @@ static void b43_ssb_remove(struct ssb_device *sdev)
                 ieee80211_unregister_hw(wl->hw);
         }
 
-        b43_one_core_detach(wldev->dev);
+        b43_one_core_detach(dev);
 
         if (list_empty(&wl->devlist)) {
                 b43_leds_unregister(wl);
                 /* Last core on the chip unregistered.
                  * We can destroy common struct b43_wl.
                  */
-                b43_wireless_exit(wldev->dev, wl);
+                b43_wireless_exit(dev, wl);
         }
 }
 
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)
         usb_free_urb(dev->out_urb);
         kfree(dev);
 
-        nfc_dev_info(&dev->interface->dev, "NXP PN533 NFC device disconnected");
+        nfc_dev_info(&interface->dev, "NXP PN533 NFC device disconnected");
 }
 
 static struct usb_driver pn533_driver = {
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 1ad0f39fe091..02751dbc5a97 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -903,7 +903,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
             initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
             !is_world_regdom(last_request->alpha2)) {
                 REG_DBG_PRINT("Ignoring regulatory request %s "
-                              "since the driver requires its own regulaotry "
+                              "since the driver requires its own regulatory "
                               "domain to be set first",
                               reg_initiator_name(initiator));
                 return true;
@@ -1125,12 +1125,13 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
         enum ieee80211_band band;
 
         if (ignore_reg_update(wiphy, initiator))
-                goto out;
+                return;
+
         for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
                 if (wiphy->bands[band])
                         handle_band(wiphy, band, initiator);
         }
-out:
+
         reg_process_beacons(wiphy);
         reg_process_ht_flags(wiphy);
         if (wiphy->reg_notifier)