From 28d79832a2129f944f41f4d49b3c8f56a087fb79 Mon Sep 17 00:00:00 2001
From: Daniel Ngu <daniel.dy.ngu@gmail.com>
Date: Tue, 23 Mar 2010 00:52:44 +1300
Subject: [PATCH] --- yaml --- r: 193857 b: refs/heads/master c:
 c5a079f46aabff026b2acaba0a2579a74c3c3731 h: refs/heads/master i:   193855:
 0aadf07cee3649f51731b4e9993fa2a0e4085026 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/main.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4944551c10a8..fb86ec445b51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e4dcd012423b6a28f968a55886d2b27896a1586
+refs/heads/master: c5a079f46aabff026b2acaba0a2579a74c3c3731
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 1521b1e78d21..14cf3bd7ea51 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -4348,11 +4348,10 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
 	b43_set_phytxctl_defaults(dev);
 
 	/* Minimum Contention Window */
-	if (phy->type == B43_PHYTYPE_B) {
+	if (phy->type == B43_PHYTYPE_B)
 		b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0x1F);
-	} else {
+	else
 		b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MINCONT, 0xF);
-	}
 	/* Maximum Contention Window */
 	b43_shm_write16(dev, B43_SHM_SCRATCH, B43_SHM_SC_MAXCONT, 0x3FF);