---

yaml --- r: 338060 b: refs/heads/master c: 545bb52 h: refs/heads/master v: v3
git-mirror · Nov 21, 2012 · e9b8019 · e9b8019
1 parent 2492e43
commit e9b8019
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ef68ab4dd8d16c10e7b36796f11b6a209acc1de
+refs/heads/master: 545bb52ccd8008c113a002b7f7d5165aa6da5ee3
diff --git a/trunk/drivers/staging/rtl8187se/r8185b_init.c b/trunk/drivers/staging/rtl8187se/r8185b_init.c
@@ -223,9 +223,10 @@ static bool HwHSSIThreeWire(struct net_device *dev,
 		udelay(10);
 	}
 	if (TryCnt == TC_3W_POLL_MAX_TRY_CNT) {
-		printk(KERN_ERR "rtl8187se: HwThreeWire(): CmdReg:"
-		       " %#X RE|WE bits are not clear!!\n", u1bTmp);
-		return false;
+		netdev_err(dev,
+			   "HwThreeWire(): CmdReg: %#X RE|WE bits are not clear!!\n",
+			   u1bTmp);
+	return false;
 	}
 
 	/* RTL8187S HSSI Read/Write Function */
@@ -419,7 +420,7 @@ void ZEBRA_Config_85BASIC_HardCode(struct net_device *dev)
 
 	if (u4bRF23 == 0x818 && u4bRF24 == 0x70C) {
 		d_cut = 1;
-		printk(KERN_INFO "rtl8187se: card type changed from C- to D-cut\n");
+		netdev_info(dev, "card type changed from C- to D-cut\n");
 	}
 
 	/* Page0 : reg0-reg15 */