projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
01c2a9c
)
asus-laptop: fix gps rfkill
author
Corentin Chary
<corentincj@iksaif.net>
Tue, 24 Aug 2010 07:30:46 +0000
(09:30 +0200)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Mon, 22 Nov 2010 19:03:15 +0000
(11:03 -0800)
commit
23f45c3a76e715217f40ac397c15815c774cad7f
upstream.
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.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/platform/x86/asus-laptop.c
patch
|
blob
|
history
diff --git
a/drivers/platform/x86/asus-laptop.c
b/drivers/platform/x86/asus-laptop.c
index b756e07d41b4d9c551fe6234889d23d97a4ffcd8..e8acb1c7b1943f5dea2d85cf26317cd7d0aa9e35 100644
(file)
--- a/
drivers/platform/x86/asus-laptop.c
+++ b/
drivers/platform/x86/asus-laptop.c
@@
-1065,9
+1065,9
@@
static ssize_t store_gps(struct device *dev, struct device_attribute *attr,
*/
static int asus_gps_rfkill_set(void *data, bool blocked)
{
-
acpi_handle handle
= data;
+
struct asus_laptop *asus
= data;
- return asus_gps_switch(
handle
, !blocked);
+ return asus_gps_switch(
asus
, !blocked);
}
static const struct rfkill_ops asus_gps_rfkill_ops = {
@@
-1094,7
+1094,7
@@
static int asus_rfkill_init(struct asus_laptop *asus)
asus->gps_rfkill = rfkill_alloc("asus-gps", &asus->platform_device->dev,
RFKILL_TYPE_GPS,
- &asus_gps_rfkill_ops,
NULL
);
+ &asus_gps_rfkill_ops,
asus
);
if (!asus->gps_rfkill)
return -EINVAL;