tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

staging: rtl8712: fix stack dump

del_timer_sync() is not to be called in the interrupt context unless
the timer is irqsafe. but most of the functions where commits
6501c8e7d86cca5f and 382d020f4459cd77 touched were called in interrupt
context. And as a result the WARN_ON was getting triggered. Changed
to del_timer() in places which were called from interrupt.

Fixes: 382d020f4459cd77 ("Staging: rtl8712: Eliminate use of _cancel_timer"
Fixes: 6501c8e7d86cca5f ("Staging: rtl8712: Eliminate use of _cancel_timer_ex")
Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=97711
Reported-by: Arek Rusniak <arek.rusi@gmail.com>
Tested-by: Arek Rusniak <arek.rusi@gmail.com>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Sudip Mukherjee and committed by
Greg Kroah-Hartman 39a6e737 9a59029b

+78 -78
+72 -72
drivers/staging/rtl8712/rtl8712_led.c
··· 898 898 IS_LED_WPS_BLINKING(pLed)) 899 899 return; 900 900 if (pLed->bLedLinkBlinkInProgress == true) { 901 - del_timer_sync(&pLed->BlinkTimer); 901 + del_timer(&pLed->BlinkTimer); 902 902 pLed->bLedLinkBlinkInProgress = false; 903 903 } 904 904 if (pLed->bLedBlinkInProgress == true) { 905 - del_timer_sync(&pLed->BlinkTimer); 905 + del_timer(&pLed->BlinkTimer); 906 906 pLed->bLedBlinkInProgress = false; 907 907 } 908 908 pLed->bLedNoLinkBlinkInProgress = true; ··· 921 921 IS_LED_WPS_BLINKING(pLed)) 922 922 return; 923 923 if (pLed->bLedNoLinkBlinkInProgress == true) { 924 - del_timer_sync(&pLed->BlinkTimer); 924 + del_timer(&pLed->BlinkTimer); 925 925 pLed->bLedNoLinkBlinkInProgress = false; 926 926 } 927 927 if (pLed->bLedBlinkInProgress == true) { 928 - del_timer_sync(&pLed->BlinkTimer); 928 + del_timer(&pLed->BlinkTimer); 929 929 pLed->bLedBlinkInProgress = false; 930 930 } 931 931 pLed->bLedLinkBlinkInProgress = true; ··· 946 946 if (IS_LED_WPS_BLINKING(pLed)) 947 947 return; 948 948 if (pLed->bLedNoLinkBlinkInProgress == true) { 949 - del_timer_sync(&pLed->BlinkTimer); 949 + del_timer(&pLed->BlinkTimer); 950 950 pLed->bLedNoLinkBlinkInProgress = false; 951 951 } 952 952 if (pLed->bLedLinkBlinkInProgress == true) { 953 - del_timer_sync(&pLed->BlinkTimer); 953 + del_timer(&pLed->BlinkTimer); 954 954 pLed->bLedLinkBlinkInProgress = false; 955 955 } 956 956 if (pLed->bLedBlinkInProgress == true) { 957 - del_timer_sync(&pLed->BlinkTimer); 957 + del_timer(&pLed->BlinkTimer); 958 958 pLed->bLedBlinkInProgress = false; 959 959 } 960 960 pLed->bLedScanBlinkInProgress = true; ··· 975 975 IS_LED_WPS_BLINKING(pLed)) 976 976 return; 977 977 if (pLed->bLedNoLinkBlinkInProgress == true) { 978 - del_timer_sync(&pLed->BlinkTimer); 978 + del_timer(&pLed->BlinkTimer); 979 979 pLed->bLedNoLinkBlinkInProgress = false; 980 980 } 981 981 if (pLed->bLedLinkBlinkInProgress == true) { 982 - del_timer_sync(&pLed->BlinkTimer); 982 + del_timer(&pLed->BlinkTimer); 983 983 pLed->bLedLinkBlinkInProgress = false; 984 984 } 985 985 pLed->bLedBlinkInProgress = true; ··· 998 998 case LED_CTL_START_WPS_BOTTON: 999 999 if (pLed->bLedWPSBlinkInProgress == false) { 1000 1000 if (pLed->bLedNoLinkBlinkInProgress == true) { 1001 - del_timer_sync(&pLed->BlinkTimer); 1001 + del_timer(&pLed->BlinkTimer); 1002 1002 pLed->bLedNoLinkBlinkInProgress = false; 1003 1003 } 1004 1004 if (pLed->bLedLinkBlinkInProgress == true) { 1005 - del_timer_sync(&pLed->BlinkTimer); 1005 + del_timer(&pLed->BlinkTimer); 1006 1006 pLed->bLedLinkBlinkInProgress = false; 1007 1007 } 1008 1008 if (pLed->bLedBlinkInProgress == true) { 1009 - del_timer_sync(&pLed->BlinkTimer); 1009 + del_timer(&pLed->BlinkTimer); 1010 1010 pLed->bLedBlinkInProgress = false; 1011 1011 } 1012 1012 if (pLed->bLedScanBlinkInProgress == true) { 1013 - del_timer_sync(&pLed->BlinkTimer); 1013 + del_timer(&pLed->BlinkTimer); 1014 1014 pLed->bLedScanBlinkInProgress = false; 1015 1015 } 1016 1016 pLed->bLedWPSBlinkInProgress = true; ··· 1025 1025 break; 1026 1026 case LED_CTL_STOP_WPS: 1027 1027 if (pLed->bLedNoLinkBlinkInProgress == true) { 1028 - del_timer_sync(&pLed->BlinkTimer); 1028 + del_timer(&pLed->BlinkTimer); 1029 1029 pLed->bLedNoLinkBlinkInProgress = false; 1030 1030 } 1031 1031 if (pLed->bLedLinkBlinkInProgress == true) { 1032 - del_timer_sync(&pLed->BlinkTimer); 1032 + del_timer(&pLed->BlinkTimer); 1033 1033 pLed->bLedLinkBlinkInProgress = false; 1034 1034 } 1035 1035 if (pLed->bLedBlinkInProgress == true) { 1036 - del_timer_sync(&pLed->BlinkTimer); 1036 + del_timer(&pLed->BlinkTimer); 1037 1037 pLed->bLedBlinkInProgress = false; 1038 1038 } 1039 1039 if (pLed->bLedScanBlinkInProgress == true) { 1040 - del_timer_sync(&pLed->BlinkTimer); 1040 + del_timer(&pLed->BlinkTimer); 1041 1041 pLed->bLedScanBlinkInProgress = false; 1042 1042 } 1043 1043 if (pLed->bLedWPSBlinkInProgress) 1044 - del_timer_sync(&pLed->BlinkTimer); 1044 + del_timer(&pLed->BlinkTimer); 1045 1045 else 1046 1046 pLed->bLedWPSBlinkInProgress = true; 1047 1047 pLed->CurrLedState = LED_BLINK_WPS_STOP; ··· 1057 1057 break; 1058 1058 case LED_CTL_STOP_WPS_FAIL: 1059 1059 if (pLed->bLedWPSBlinkInProgress) { 1060 - del_timer_sync(&pLed->BlinkTimer); 1060 + del_timer(&pLed->BlinkTimer); 1061 1061 pLed->bLedWPSBlinkInProgress = false; 1062 1062 } 1063 1063 pLed->bLedNoLinkBlinkInProgress = true; ··· 1073 1073 pLed->CurrLedState = LED_OFF; 1074 1074 pLed->BlinkingLedState = LED_OFF; 1075 1075 if (pLed->bLedNoLinkBlinkInProgress) { 1076 - del_timer_sync(&pLed->BlinkTimer); 1076 + del_timer(&pLed->BlinkTimer); 1077 1077 pLed->bLedNoLinkBlinkInProgress = false; 1078 1078 } 1079 1079 if (pLed->bLedLinkBlinkInProgress) { 1080 - del_timer_sync(&pLed->BlinkTimer); 1080 + del_timer(&pLed->BlinkTimer); 1081 1081 pLed->bLedLinkBlinkInProgress = false; 1082 1082 } 1083 1083 if (pLed->bLedBlinkInProgress) { 1084 - del_timer_sync(&pLed->BlinkTimer); 1084 + del_timer(&pLed->BlinkTimer); 1085 1085 pLed->bLedBlinkInProgress = false; 1086 1086 } 1087 1087 if (pLed->bLedWPSBlinkInProgress) { 1088 - del_timer_sync(&pLed->BlinkTimer); 1088 + del_timer(&pLed->BlinkTimer); 1089 1089 pLed->bLedWPSBlinkInProgress = false; 1090 1090 } 1091 1091 if (pLed->bLedScanBlinkInProgress) { 1092 - del_timer_sync(&pLed->BlinkTimer); 1092 + del_timer(&pLed->BlinkTimer); 1093 1093 pLed->bLedScanBlinkInProgress = false; 1094 1094 } 1095 1095 mod_timer(&pLed->BlinkTimer, ··· 1116 1116 return; 1117 1117 1118 1118 if (pLed->bLedBlinkInProgress == true) { 1119 - del_timer_sync(&pLed->BlinkTimer); 1119 + del_timer(&pLed->BlinkTimer); 1120 1120 pLed->bLedBlinkInProgress = false; 1121 1121 } 1122 1122 pLed->bLedScanBlinkInProgress = true; ··· 1154 1154 pLed->CurrLedState = LED_ON; 1155 1155 pLed->BlinkingLedState = LED_ON; 1156 1156 if (pLed->bLedBlinkInProgress) { 1157 - del_timer_sync(&pLed->BlinkTimer); 1157 + del_timer(&pLed->BlinkTimer); 1158 1158 pLed->bLedBlinkInProgress = false; 1159 1159 } 1160 1160 if (pLed->bLedScanBlinkInProgress) { 1161 - del_timer_sync(&pLed->BlinkTimer); 1161 + del_timer(&pLed->BlinkTimer); 1162 1162 pLed->bLedScanBlinkInProgress = false; 1163 1163 } 1164 1164 ··· 1170 1170 case LED_CTL_START_WPS_BOTTON: 1171 1171 if (pLed->bLedWPSBlinkInProgress == false) { 1172 1172 if (pLed->bLedBlinkInProgress == true) { 1173 - del_timer_sync(&pLed->BlinkTimer); 1173 + del_timer(&pLed->BlinkTimer); 1174 1174 pLed->bLedBlinkInProgress = false; 1175 1175 } 1176 1176 if (pLed->bLedScanBlinkInProgress == true) { 1177 - del_timer_sync(&pLed->BlinkTimer); 1177 + del_timer(&pLed->BlinkTimer); 1178 1178 pLed->bLedScanBlinkInProgress = false; 1179 1179 } 1180 1180 pLed->bLedWPSBlinkInProgress = true; ··· 1214 1214 pLed->CurrLedState = LED_OFF; 1215 1215 pLed->BlinkingLedState = LED_OFF; 1216 1216 if (pLed->bLedBlinkInProgress) { 1217 - del_timer_sync(&pLed->BlinkTimer); 1217 + del_timer(&pLed->BlinkTimer); 1218 1218 pLed->bLedBlinkInProgress = false; 1219 1219 } 1220 1220 if (pLed->bLedScanBlinkInProgress) { 1221 - del_timer_sync(&pLed->BlinkTimer); 1221 + del_timer(&pLed->BlinkTimer); 1222 1222 pLed->bLedScanBlinkInProgress = false; 1223 1223 } 1224 1224 if (pLed->bLedWPSBlinkInProgress) { 1225 - del_timer_sync(&pLed->BlinkTimer); 1225 + del_timer(&pLed->BlinkTimer); 1226 1226 pLed->bLedWPSBlinkInProgress = false; 1227 1227 } 1228 1228 mod_timer(&pLed->BlinkTimer, ··· 1248 1248 if (IS_LED_WPS_BLINKING(pLed)) 1249 1249 return; 1250 1250 if (pLed->bLedBlinkInProgress == true) { 1251 - del_timer_sync(&pLed->BlinkTimer); 1251 + del_timer(&pLed->BlinkTimer); 1252 1252 pLed->bLedBlinkInProgress = false; 1253 1253 } 1254 1254 pLed->bLedScanBlinkInProgress = true; ··· 1286 1286 pLed->CurrLedState = LED_ON; 1287 1287 pLed->BlinkingLedState = LED_ON; 1288 1288 if (pLed->bLedBlinkInProgress) { 1289 - del_timer_sync(&pLed->BlinkTimer); 1289 + del_timer(&pLed->BlinkTimer); 1290 1290 pLed->bLedBlinkInProgress = false; 1291 1291 } 1292 1292 if (pLed->bLedScanBlinkInProgress) { 1293 - del_timer_sync(&pLed->BlinkTimer); 1293 + del_timer(&pLed->BlinkTimer); 1294 1294 pLed->bLedScanBlinkInProgress = false; 1295 1295 } 1296 1296 mod_timer(&pLed->BlinkTimer, ··· 1300 1300 case LED_CTL_START_WPS_BOTTON: 1301 1301 if (pLed->bLedWPSBlinkInProgress == false) { 1302 1302 if (pLed->bLedBlinkInProgress == true) { 1303 - del_timer_sync(&pLed->BlinkTimer); 1303 + del_timer(&pLed->BlinkTimer); 1304 1304 pLed->bLedBlinkInProgress = false; 1305 1305 } 1306 1306 if (pLed->bLedScanBlinkInProgress == true) { 1307 - del_timer_sync(&pLed->BlinkTimer); 1307 + del_timer(&pLed->BlinkTimer); 1308 1308 pLed->bLedScanBlinkInProgress = false; 1309 1309 } 1310 1310 pLed->bLedWPSBlinkInProgress = true; ··· 1319 1319 break; 1320 1320 case LED_CTL_STOP_WPS: 1321 1321 if (pLed->bLedWPSBlinkInProgress) { 1322 - del_timer_sync(&(pLed->BlinkTimer)); 1322 + del_timer(&pLed->BlinkTimer); 1323 1323 pLed->bLedWPSBlinkInProgress = false; 1324 1324 } else 1325 1325 pLed->bLedWPSBlinkInProgress = true; ··· 1336 1336 break; 1337 1337 case LED_CTL_STOP_WPS_FAIL: 1338 1338 if (pLed->bLedWPSBlinkInProgress) { 1339 - del_timer_sync(&pLed->BlinkTimer); 1339 + del_timer(&pLed->BlinkTimer); 1340 1340 pLed->bLedWPSBlinkInProgress = false; 1341 1341 } 1342 1342 pLed->CurrLedState = LED_OFF; ··· 1357 1357 pLed->CurrLedState = LED_OFF; 1358 1358 pLed->BlinkingLedState = LED_OFF; 1359 1359 if (pLed->bLedBlinkInProgress) { 1360 - del_timer_sync(&pLed->BlinkTimer); 1360 + del_timer(&pLed->BlinkTimer); 1361 1361 pLed->bLedBlinkInProgress = false; 1362 1362 } 1363 1363 if (pLed->bLedScanBlinkInProgress) { 1364 - del_timer_sync(&pLed->BlinkTimer); 1364 + del_timer(&pLed->BlinkTimer); 1365 1365 pLed->bLedScanBlinkInProgress = false; 1366 1366 } 1367 1367 if (pLed->bLedWPSBlinkInProgress) { 1368 - del_timer_sync(&pLed->BlinkTimer); 1368 + del_timer(&pLed->BlinkTimer); 1369 1369 pLed->bLedWPSBlinkInProgress = false; 1370 1370 } 1371 1371 mod_timer(&pLed->BlinkTimer, ··· 1388 1388 case LED_CTL_START_TO_LINK: 1389 1389 if (pLed1->bLedWPSBlinkInProgress) { 1390 1390 pLed1->bLedWPSBlinkInProgress = false; 1391 - del_timer_sync(&pLed1->BlinkTimer); 1391 + del_timer(&pLed1->BlinkTimer); 1392 1392 pLed1->BlinkingLedState = LED_OFF; 1393 1393 pLed1->CurrLedState = LED_OFF; 1394 1394 if (pLed1->bLedOn) ··· 1400 1400 IS_LED_WPS_BLINKING(pLed)) 1401 1401 return; 1402 1402 if (pLed->bLedBlinkInProgress == true) { 1403 - del_timer_sync(&pLed->BlinkTimer); 1403 + del_timer(&pLed->BlinkTimer); 1404 1404 pLed->bLedBlinkInProgress = false; 1405 1405 } 1406 1406 if (pLed->bLedNoLinkBlinkInProgress == true) { 1407 - del_timer_sync(&pLed->BlinkTimer); 1407 + del_timer(&pLed->BlinkTimer); 1408 1408 pLed->bLedNoLinkBlinkInProgress = false; 1409 1409 } 1410 1410 pLed->bLedStartToLinkBlinkInProgress = true; ··· 1426 1426 if (LedAction == LED_CTL_LINK) { 1427 1427 if (pLed1->bLedWPSBlinkInProgress) { 1428 1428 pLed1->bLedWPSBlinkInProgress = false; 1429 - del_timer_sync(&pLed1->BlinkTimer); 1429 + del_timer(&pLed1->BlinkTimer); 1430 1430 pLed1->BlinkingLedState = LED_OFF; 1431 1431 pLed1->CurrLedState = LED_OFF; 1432 1432 if (pLed1->bLedOn) ··· 1439 1439 IS_LED_WPS_BLINKING(pLed)) 1440 1440 return; 1441 1441 if (pLed->bLedBlinkInProgress == true) { 1442 - del_timer_sync(&pLed->BlinkTimer); 1442 + del_timer(&pLed->BlinkTimer); 1443 1443 pLed->bLedBlinkInProgress = false; 1444 1444 } 1445 1445 pLed->bLedNoLinkBlinkInProgress = true; ··· 1460 1460 if (IS_LED_WPS_BLINKING(pLed)) 1461 1461 return; 1462 1462 if (pLed->bLedNoLinkBlinkInProgress == true) { 1463 - del_timer_sync(&pLed->BlinkTimer); 1463 + del_timer(&pLed->BlinkTimer); 1464 1464 pLed->bLedNoLinkBlinkInProgress = false; 1465 1465 } 1466 1466 if (pLed->bLedBlinkInProgress == true) { 1467 - del_timer_sync(&pLed->BlinkTimer); 1467 + del_timer(&pLed->BlinkTimer); 1468 1468 pLed->bLedBlinkInProgress = false; 1469 1469 } 1470 1470 pLed->bLedScanBlinkInProgress = true; ··· 1485 1485 IS_LED_WPS_BLINKING(pLed)) 1486 1486 return; 1487 1487 if (pLed->bLedNoLinkBlinkInProgress == true) { 1488 - del_timer_sync(&pLed->BlinkTimer); 1488 + del_timer(&pLed->BlinkTimer); 1489 1489 pLed->bLedNoLinkBlinkInProgress = false; 1490 1490 } 1491 1491 pLed->bLedBlinkInProgress = true; ··· 1503 1503 case LED_CTL_START_WPS_BOTTON: 1504 1504 if (pLed1->bLedWPSBlinkInProgress) { 1505 1505 pLed1->bLedWPSBlinkInProgress = false; 1506 - del_timer_sync(&(pLed1->BlinkTimer)); 1506 + del_timer(&pLed1->BlinkTimer); 1507 1507 pLed1->BlinkingLedState = LED_OFF; 1508 1508 pLed1->CurrLedState = LED_OFF; 1509 1509 if (pLed1->bLedOn) ··· 1512 1512 } 1513 1513 if (pLed->bLedWPSBlinkInProgress == false) { 1514 1514 if (pLed->bLedNoLinkBlinkInProgress == true) { 1515 - del_timer_sync(&pLed->BlinkTimer); 1515 + del_timer(&pLed->BlinkTimer); 1516 1516 pLed->bLedNoLinkBlinkInProgress = false; 1517 1517 } 1518 1518 if (pLed->bLedBlinkInProgress == true) { 1519 - del_timer_sync(&pLed->BlinkTimer); 1519 + del_timer(&pLed->BlinkTimer); 1520 1520 pLed->bLedBlinkInProgress = false; 1521 1521 } 1522 1522 if (pLed->bLedScanBlinkInProgress == true) { 1523 - del_timer_sync(&pLed->BlinkTimer); 1523 + del_timer(&pLed->BlinkTimer); 1524 1524 pLed->bLedScanBlinkInProgress = false; 1525 1525 } 1526 1526 pLed->bLedWPSBlinkInProgress = true; ··· 1538 1538 break; 1539 1539 case LED_CTL_STOP_WPS: /*WPS connect success*/ 1540 1540 if (pLed->bLedWPSBlinkInProgress) { 1541 - del_timer_sync(&pLed->BlinkTimer); 1541 + del_timer(&pLed->BlinkTimer); 1542 1542 pLed->bLedWPSBlinkInProgress = false; 1543 1543 } 1544 1544 pLed->bLedNoLinkBlinkInProgress = true; ··· 1552 1552 break; 1553 1553 case LED_CTL_STOP_WPS_FAIL: /*WPS authentication fail*/ 1554 1554 if (pLed->bLedWPSBlinkInProgress) { 1555 - del_timer_sync(&pLed->BlinkTimer); 1555 + del_timer(&pLed->BlinkTimer); 1556 1556 pLed->bLedWPSBlinkInProgress = false; 1557 1557 } 1558 1558 pLed->bLedNoLinkBlinkInProgress = true; ··· 1565 1565 msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA)); 1566 1566 /*LED1 settings*/ 1567 1567 if (pLed1->bLedWPSBlinkInProgress) 1568 - del_timer_sync(&pLed1->BlinkTimer); 1568 + del_timer(&pLed1->BlinkTimer); 1569 1569 else 1570 1570 pLed1->bLedWPSBlinkInProgress = true; 1571 1571 pLed1->CurrLedState = LED_BLINK_WPS_STOP; ··· 1578 1578 break; 1579 1579 case LED_CTL_STOP_WPS_FAIL_OVERLAP: /*WPS session overlap*/ 1580 1580 if (pLed->bLedWPSBlinkInProgress) { 1581 - del_timer_sync(&pLed->BlinkTimer); 1581 + del_timer(&pLed->BlinkTimer); 1582 1582 pLed->bLedWPSBlinkInProgress = false; 1583 1583 } 1584 1584 pLed->bLedNoLinkBlinkInProgress = true; ··· 1591 1591 msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA)); 1592 1592 /*LED1 settings*/ 1593 1593 if (pLed1->bLedWPSBlinkInProgress) 1594 - del_timer_sync(&pLed1->BlinkTimer); 1594 + del_timer(&pLed1->BlinkTimer); 1595 1595 else 1596 1596 pLed1->bLedWPSBlinkInProgress = true; 1597 1597 pLed1->CurrLedState = LED_BLINK_WPS_STOP_OVERLAP; ··· 1607 1607 pLed->CurrLedState = LED_OFF; 1608 1608 pLed->BlinkingLedState = LED_OFF; 1609 1609 if (pLed->bLedNoLinkBlinkInProgress) { 1610 - del_timer_sync(&pLed->BlinkTimer); 1610 + del_timer(&pLed->BlinkTimer); 1611 1611 pLed->bLedNoLinkBlinkInProgress = false; 1612 1612 } 1613 1613 if (pLed->bLedLinkBlinkInProgress) { 1614 - del_timer_sync(&pLed->BlinkTimer); 1614 + del_timer(&pLed->BlinkTimer); 1615 1615 pLed->bLedLinkBlinkInProgress = false; 1616 1616 } 1617 1617 if (pLed->bLedBlinkInProgress) { 1618 - del_timer_sync(&pLed->BlinkTimer); 1618 + del_timer(&pLed->BlinkTimer); 1619 1619 pLed->bLedBlinkInProgress = false; 1620 1620 } 1621 1621 if (pLed->bLedWPSBlinkInProgress) { 1622 - del_timer_sync(&pLed->BlinkTimer); 1622 + del_timer(&pLed->BlinkTimer); 1623 1623 pLed->bLedWPSBlinkInProgress = false; 1624 1624 } 1625 1625 if (pLed->bLedScanBlinkInProgress) { 1626 - del_timer_sync(&pLed->BlinkTimer); 1626 + del_timer(&pLed->BlinkTimer); 1627 1627 pLed->bLedScanBlinkInProgress = false; 1628 1628 } 1629 1629 if (pLed->bLedStartToLinkBlinkInProgress) { 1630 - del_timer_sync(&pLed->BlinkTimer); 1630 + del_timer(&pLed->BlinkTimer); 1631 1631 pLed->bLedStartToLinkBlinkInProgress = false; 1632 1632 } 1633 1633 if (pLed1->bLedWPSBlinkInProgress) { 1634 - del_timer_sync(&pLed1->BlinkTimer); 1634 + del_timer(&pLed1->BlinkTimer); 1635 1635 pLed1->bLedWPSBlinkInProgress = false; 1636 1636 } 1637 1637 pLed1->BlinkingLedState = LED_UNKNOWN; ··· 1671 1671 ; /* dummy branch */ 1672 1672 else if (pLed->bLedScanBlinkInProgress == false) { 1673 1673 if (pLed->bLedBlinkInProgress == true) { 1674 - del_timer_sync(&pLed->BlinkTimer); 1674 + del_timer(&pLed->BlinkTimer); 1675 1675 pLed->bLedBlinkInProgress = false; 1676 1676 } 1677 1677 pLed->bLedScanBlinkInProgress = true; ··· 1705 1705 pLed->CurrLedState = LED_OFF; 1706 1706 pLed->BlinkingLedState = LED_OFF; 1707 1707 if (pLed->bLedBlinkInProgress) { 1708 - del_timer_sync(&pLed->BlinkTimer); 1708 + del_timer(&pLed->BlinkTimer); 1709 1709 pLed->bLedBlinkInProgress = false; 1710 1710 } 1711 1711 SwLedOff(padapter, pLed); ··· 1756 1756 case LED_CTL_START_WPS_BOTTON: 1757 1757 if (pLed->bLedWPSBlinkInProgress == false) { 1758 1758 if (pLed->bLedBlinkInProgress == true) { 1759 - del_timer_sync(&pLed->BlinkTimer); 1759 + del_timer(&pLed->BlinkTimer); 1760 1760 pLed->bLedBlinkInProgress = false; 1761 1761 } 1762 1762 pLed->bLedWPSBlinkInProgress = true; ··· 1772 1772 case LED_CTL_STOP_WPS_FAIL: 1773 1773 case LED_CTL_STOP_WPS: 1774 1774 if (pLed->bLedWPSBlinkInProgress) { 1775 - del_timer_sync(&pLed->BlinkTimer); 1775 + del_timer(&pLed->BlinkTimer); 1776 1776 pLed->bLedWPSBlinkInProgress = false; 1777 1777 } 1778 1778 pLed->CurrLedState = LED_ON; ··· 1784 1784 pLed->CurrLedState = LED_OFF; 1785 1785 pLed->BlinkingLedState = LED_OFF; 1786 1786 if (pLed->bLedBlinkInProgress) { 1787 - del_timer_sync(&pLed->BlinkTimer); 1787 + del_timer(&pLed->BlinkTimer); 1788 1788 pLed->bLedBlinkInProgress = false; 1789 1789 } 1790 1790 if (pLed->bLedWPSBlinkInProgress) { 1791 - del_timer_sync(&pLed->BlinkTimer); 1791 + del_timer(&pLed->BlinkTimer); 1792 1792 pLed->bLedWPSBlinkInProgress = false; 1793 1793 } 1794 1794 SwLedOff(padapter, pLed);
+1 -1
drivers/staging/rtl8712/rtl871x_cmd.c
··· 910 910 if (pcmd->res != H2C_SUCCESS) 911 911 mod_timer(&pmlmepriv->assoc_timer, 912 912 jiffies + msecs_to_jiffies(1)); 913 - del_timer_sync(&pmlmepriv->assoc_timer); 913 + del_timer(&pmlmepriv->assoc_timer); 914 914 #ifdef __BIG_ENDIAN 915 915 /* endian_convert */ 916 916 pnetwork->Length = le32_to_cpu(pnetwork->Length);
+3 -3
drivers/staging/rtl8712/rtl871x_mlme.c
··· 582 582 spin_lock_irqsave(&pmlmepriv->lock, irqL); 583 583 584 584 if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { 585 - del_timer_sync(&pmlmepriv->scan_to_timer); 585 + del_timer(&pmlmepriv->scan_to_timer); 586 586 587 587 _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); 588 588 } ··· 696 696 } 697 697 if (padapter->pwrctrlpriv.pwr_mode != 698 698 padapter->registrypriv.power_mgnt) { 699 - del_timer_sync(&pmlmepriv->dhcp_timer); 699 + del_timer(&pmlmepriv->dhcp_timer); 700 700 r8712_set_ps_mode(padapter, padapter->registrypriv.power_mgnt, 701 701 padapter->registrypriv.smart_ps); 702 702 } ··· 910 910 if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) 911 911 == true) 912 912 r8712_indicate_connect(adapter); 913 - del_timer_sync(&pmlmepriv->assoc_timer); 913 + del_timer(&pmlmepriv->assoc_timer); 914 914 } else 915 915 goto ignore_joinbss_callback; 916 916 } else {
+1 -1
drivers/staging/rtl8712/rtl871x_pwrctrl.c
··· 103 103 104 104 if (pwrpriv->cpwm_tog == ((preportpwrstate->state) & 0x80)) 105 105 return; 106 - del_timer_sync(&padapter->pwrctrlpriv.rpwm_check_timer); 106 + del_timer(&padapter->pwrctrlpriv.rpwm_check_timer); 107 107 _enter_pwrlock(&pwrpriv->lock); 108 108 pwrpriv->cpwm = (preportpwrstate->state) & 0xf; 109 109 if (pwrpriv->cpwm >= PS_STATE_S2) {
+1 -1
drivers/staging/rtl8712/rtl871x_sta_mgt.c
··· 198 198 * cancel reordering_ctrl_timer */ 199 199 for (i = 0; i < 16; i++) { 200 200 preorder_ctrl = &psta->recvreorder_ctrl[i]; 201 - del_timer_sync(&preorder_ctrl->reordering_ctrl_timer); 201 + del_timer(&preorder_ctrl->reordering_ctrl_timer); 202 202 } 203 203 spin_lock(&(pfree_sta_queue->lock)); 204 204 /* insert into free_sta_queue; 20061114 */