File tree Expand file tree Collapse file tree 1 file changed +13
-10
lines changed Expand file tree Collapse file tree 1 file changed +13
-10
lines changed Original file line number Diff line number Diff line change @@ -161,6 +161,16 @@ MODULE_LICENSE("GPL");
161
161
162
162
static const char * const ashs_ids [] = { "ATK4001" , "ATK4002" , NULL };
163
163
164
+ static bool ashs_present (void )
165
+ {
166
+ int i = 0 ;
167
+ while (ashs_ids [i ]) {
168
+ if (acpi_dev_found (ashs_ids [i ++ ]))
169
+ return true;
170
+ }
171
+ return false;
172
+ }
173
+
164
174
struct bios_args {
165
175
u32 arg0 ;
166
176
u32 arg1 ;
@@ -962,6 +972,9 @@ static int asus_new_rfkill(struct asus_wmi *asus,
962
972
963
973
static void asus_wmi_rfkill_exit (struct asus_wmi * asus )
964
974
{
975
+ if (asus -> driver -> wlan_ctrl_by_user && ashs_present ())
976
+ return ;
977
+
965
978
asus_unregister_rfkill_notifier (asus , "\\_SB.PCI0.P0P5" );
966
979
asus_unregister_rfkill_notifier (asus , "\\_SB.PCI0.P0P6" );
967
980
asus_unregister_rfkill_notifier (asus , "\\_SB.PCI0.P0P7" );
@@ -2058,16 +2071,6 @@ static int asus_wmi_fan_init(struct asus_wmi *asus)
2058
2071
return 0 ;
2059
2072
}
2060
2073
2061
- static bool ashs_present (void )
2062
- {
2063
- int i = 0 ;
2064
- while (ashs_ids [i ]) {
2065
- if (acpi_dev_found (ashs_ids [i ++ ]))
2066
- return true;
2067
- }
2068
- return false;
2069
- }
2070
-
2071
2074
/*
2072
2075
* WMI Driver
2073
2076
*/
You can’t perform that action at this time.
0 commit comments