summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorCorentin Chary <corentin.chary@gmail.com>2011-03-30 16:32:32 +0200
committerMatthew Garrett <mjg@redhat.com>2011-04-01 20:23:55 +0200
commit58a9f397ac9288403d600b22b8472c0d164ee8cb (patch)
treeb8723eaac2127c7ffc19c17be5e97d63ce8bc0f3 /drivers/platform/x86
parentasus-laptop: remove removed features from feature-removal-schedule.txt (diff)
downloadlinux-58a9f397ac9288403d600b22b8472c0d164ee8cb.tar.xz
linux-58a9f397ac9288403d600b22b8472c0d164ee8cb.zip
asus-wmi: swap input name and phys
Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/asus-wmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index efc776cb0c66..832a3fd7c1c8 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -201,8 +201,8 @@ static int asus_wmi_input_init(struct asus_wmi *asus)
if (!asus->inputdev)
return -ENOMEM;
- asus->inputdev->name = asus->driver->input_phys;
- asus->inputdev->phys = asus->driver->input_name;
+ asus->inputdev->name = asus->driver->input_name;
+ asus->inputdev->phys = asus->driver->input_phys;
asus->inputdev->id.bustype = BUS_HOST;
asus->inputdev->dev.parent = &asus->platform_device->dev;