---

yaml --- r: 220134 b: refs/heads/master c: e9887c9 h: refs/heads/master v: v3
git-mirror · Oct 6, 2010 · 1f6cf22 · 1f6cf22
1 parent 7bc5136
commit 1f6cf22
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f782dee8d58247f2a277f142a59c227fd0b500e
+refs/heads/master: e9887c9d9c37b8af80ae04aad1532d5c46687f8b
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -985,7 +985,8 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
 
 		if (err_ret) {
 			sd_err(("%s: %s FAILED %p[%d], addr=0x%05x, pkt_len=%d,"
-				 "ERR=0x%08x\n", __func__, (write) ? "TX":"RX",
+				 "ERR=0x%08x\n", __func__,
+				 (write) ? "TX" : "RX",
 				 pnext, SGCount, addr, pkt_len, err_ret));
 		} else {
 			sd_trace(("%s: %s xfr'd %p[%d], addr=0x%05x, len=%d\n",

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -151,7 +151,7 @@ int dhd_custom_get_mac_address(unsigned char *buf)
 	/* EXAMPLE code */
 	{
 		struct ether_addr ea_example = {
-			{0x00, 0x11, 0x22, 0x33, 0x44, 0xFF}};
+			{0x00, 0x11, 0x22, 0x33, 0x44, 0xFF} };
 		bcopy((char *)&ea_example, buf, sizeof(struct ether_addr));
 	}
 #endif				/* EXAMPLE_GET_MAC */

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -1421,7 +1421,7 @@ int dhd_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
 	else
 		bus->dhd->rx_ctlerrs++;
 
-	return rxlen ? (int)rxlen:-ETIMEDOUT;
+	return rxlen ? (int)rxlen : -ETIMEDOUT;
 }
 
 /* IOVar table */
@@ -3969,7 +3969,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 		}
 
 		/* Validate check bytes */
-		if ((uint16) ~ (len ^ check)) {
+		if ((uint16) ~(len ^ check)) {
 			DHD_ERROR(("%s: HW hdr err: len/check 0x%04x/0x%04x\n",
 				__func__, len, check));
 			bus->rx_badhdr++;

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2635,7 +2635,7 @@ static void wl_init_conf(struct wl_conf *conf)
 	conf->rts_threshold = (uint32)-1;
 	conf->retry_short = (uint32)-1;
 	conf->retry_long = (uint32)-1;
-	conf->tx_power =-1;
+	conf->tx_power = -1;
 }
 
 static void wl_init_prof(struct wl_profile *prof)