diff options
author | Corentin Chary <corentincj@iksaif.net> | 2010-08-24 03:30:46 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2010-10-21 09:36:44 -0400 |
commit | 23f45c3a76e715217f40ac397c15815c774cad7f (patch) | |
tree | 8d115313d9e3a7a83e326eac2289fb1c2d8346e0 /drivers/platform | |
parent | b58baecddee634903f339b7f7e9db7fc2a1449f1 (diff) |
asus-laptop: fix gps rfkill
The GPS rfkill crappy code. The ops_data argument wasn't
set, and was totally misused. The fix have been tested
on an Asus R2H.
Cc: stable@kernel.org
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/asus-laptop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 27298a49c6d3..67d922887616 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c | |||
@@ -1066,9 +1066,9 @@ static ssize_t store_gps(struct device *dev, struct device_attribute *attr, | |||
1066 | */ | 1066 | */ |
1067 | static int asus_gps_rfkill_set(void *data, bool blocked) | 1067 | static int asus_gps_rfkill_set(void *data, bool blocked) |
1068 | { | 1068 | { |
1069 | acpi_handle handle = data; | 1069 | struct asus_laptop *asus = data; |
1070 | 1070 | ||
1071 | return asus_gps_switch(handle, !blocked); | 1071 | return asus_gps_switch(asus, !blocked); |
1072 | } | 1072 | } |
1073 | 1073 | ||
1074 | static const struct rfkill_ops asus_gps_rfkill_ops = { | 1074 | static const struct rfkill_ops asus_gps_rfkill_ops = { |
@@ -1095,7 +1095,7 @@ static int asus_rfkill_init(struct asus_laptop *asus) | |||
1095 | 1095 | ||
1096 | asus->gps_rfkill = rfkill_alloc("asus-gps", &asus->platform_device->dev, | 1096 | asus->gps_rfkill = rfkill_alloc("asus-gps", &asus->platform_device->dev, |
1097 | RFKILL_TYPE_GPS, | 1097 | RFKILL_TYPE_GPS, |
1098 | &asus_gps_rfkill_ops, NULL); | 1098 | &asus_gps_rfkill_ops, asus); |
1099 | if (!asus->gps_rfkill) | 1099 | if (!asus->gps_rfkill) |
1100 | return -EINVAL; | 1100 | return -EINVAL; |
1101 | 1101 | ||