shithub: riscv

Download patch

ref: 64849ab5f393cb21a718b050ff9178f9bf8c4ea0
parent: e10287042ee679726d029e37f5056efa6f7ea488
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Sun Apr 26 14:02:49 EDT 2015 

etheriwl: check the bluetooth co-existance errors (thanks qeed)


--- a/sys/src/9/pc/etheriwl.c
+++ b/sys/src/9/pc/etheriwl.c
@@ -864,10 +864,10 @@
 	ctlr->eeprom.temp = 0;
 	ctlr->eeprom.rawtemp = 0;
 	if(ctlr->type == Type2030){
-		if ((err = eepromread(ctlr, b, 2, caloff + 0x12a)) != nil)
+		if((err = eepromread(ctlr, b, 2, caloff + 0x12a)) != nil)
 			goto Err2;
 		ctlr->eeprom.temp = get16(b);
-		if ((err = eepromread(ctlr, b, 2, caloff + 0x12b)) != nil)
+		if((err = eepromread(ctlr, b, 2, caloff + 0x12b)) != nil)
 			goto Err2;
 		ctlr->eeprom.rawtemp = get16(b);
 	}
@@ -1183,7 +1183,7 @@
 		csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrvCalV6);
 	if(ctlr->type == Type6005)
 		csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrv1X2);
-	if (ctlr->type == Type2030)
+	if(ctlr->type == Type2030)
 		csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrvRadioIqInvert);
 	nicunlock(ctlr);
 
@@ -1479,7 +1479,7 @@
 					put16(c + 6, 2700);
 				}
 				put16(c + 8, ctlr->eeprom.volt);
-				if ((err = cmd(ctlr, 176, c, 4+2+2+2+2)) != nil)
+				if((err = cmd(ctlr, 176, c, 4+2+2+2+2)) != nil)
 					return err;
 				break;
 			}
@@ -1498,8 +1498,10 @@
 			if((err = cmd(ctlr, 152, c, 4)) != nil)
 				return err;
 
-			if(ctlr->type == Type2030)
-				sendbtcoexadv(ctlr);
+			if(ctlr->type == Type2030){
+				if((err = sendbtcoexadv(ctlr)) != nil)
+					return err;
+			}
 		}
 	}
 
@@ -2198,7 +2200,7 @@
 		if(ctlr->wifi == nil){
 			ctlr->wifi = wifiattach(edev, transmit);
 			/* tested with 2230, it has transmit issues using higher bit rates */
-			if (ctlr->type != Type2030)
+			if(ctlr->type != Type2030)
 				ctlr->wifi->rates = iwlrates;
 		}