aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/rt2860/2860_main_dev.c2
-rw-r--r--drivers/staging/rt2860/common/cmm_data.c3
-rw-r--r--drivers/staging/rt2860/sta/sync.c2
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/rt2860/2860_main_dev.c b/drivers/staging/rt2860/2860_main_dev.c
index d65bdbc6276..1e38f2d1f69 100644
--- a/drivers/staging/rt2860/2860_main_dev.c
+++ b/drivers/staging/rt2860/2860_main_dev.c
@@ -1022,7 +1022,7 @@ BOOLEAN RT28XXNetDevInit(
IN RTMP_ADAPTER *pAd)
{
struct pci_dev *pci_dev = (struct pci_dev *)_dev_p;
- CHAR *print_name;
+ const CHAR *print_name;
ULONG csr_addr;
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index 292d34b31e1..ac549011ccb 100644
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -943,9 +943,6 @@ BOOLEAN RTMP_FillTxBlkInfo(
}
return TRUE;
-
-FillTxBlkErr:
- return FALSE;
}
diff --git a/drivers/staging/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c
index a94b4b7330e..d196f85395c 100644
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -1300,8 +1300,6 @@ VOID PeerBeacon(
{
if (pAd->StaCfg.Adhoc20NJoined == FALSE)
{
- UCHAR ByteValue = 0;
-
pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel;
pAd->StaCfg.Adhoc20NJoined = TRUE;