Merge branch 'linus' into sched/devel

[mv-sheeva.git] / drivers / net / wireless / b43legacy / main.c

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index cb5ad4f7fb2b1a3358a7b6981b52cfd09aa34454..1cb77db5c29265d55d059b398f0c3dcb04c3b47a 100644 (file)
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -34,7 +34,6 @@
 #include <linux/moduleparam.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
-#include <linux/version.h>
 #include <linux/firmware.h>
 #include <linux/wireless.h>
 #include <linux/workqueue.h>
@@ -3845,10 +3844,10 @@ static int b43legacy_resume(struct ssb_device *dev)
                        goto out;
                }
        }
-       mutex_unlock(&wl->mutex);
 
        b43legacydbg(wl, "Device resumed.\n");
 out:
+       mutex_unlock(&wl->mutex);
        return err;
 }