2012-05-03 09:37:53

by Ike Panhc

[permalink] [raw]
Subject: [PATCH 0/2] ideapad: some minor fix

These patches are also available in the git repository at:
git://kernel.ubuntu.com/ikepanhc/public.git ideapad-next

Ike Panhc (2):
ideapad: remove unused define and fix a typo
ideapad: generate valid key event only

drivers/platform/x86/ideapad-laptop.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

--
1.7.9.5


2012-05-03 09:38:41

by Ike Panhc

[permalink] [raw]
Subject: [PATCH 1/2] ideapad: remove unused define and fix a typo

After review the current ideapad-laptop, found an unused define and
a typo.

Signed-off-by: Ike Panhc <[email protected]>
---
drivers/platform/x86/ideapad-laptop.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index ac902f7..00d82f1 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -194,7 +194,6 @@ static int write_ec_cmd(acpi_handle handle, int cmd, unsigned long data)
/*
* debugfs
*/
-#define DEBUGFS_EVENT_LEN (4096)
static int debugfs_status_show(struct seq_file *s, void *data)
{
unsigned long value;
@@ -315,7 +314,7 @@ static int __devinit ideapad_debugfs_init(struct ideapad_private *priv)
node = debugfs_create_file("status", S_IRUGO, priv->debug, NULL,
&debugfs_status_fops);
if (!node) {
- pr_err("failed to create event in debugfs");
+ pr_err("failed to create status in debugfs");
goto errout;
}

--
1.7.9.5

2012-05-03 09:38:53

by Ike Panhc

[permalink] [raw]
Subject: [PATCH 2/2] ideapad: generate valid key event only

Otherwise will generate KEY_UNKNOWN on un-listed vpc event,
which means nothing and is hard for user to report the detail
of the event.

Signed-off-by: Ike Panhc <[email protected]>
---
drivers/platform/x86/ideapad-laptop.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 00d82f1..4f20f8d 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -784,6 +784,10 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
case 9:
ideapad_sync_rfk_state(priv);
break;
+ case 13:
+ case 6:
+ ideapad_input_report(priv, vpc_bit);
+ break;
case 4:
ideapad_backlight_notify_brightness(priv);
break;
@@ -794,7 +798,7 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
ideapad_backlight_notify_power(priv);
break;
default:
- ideapad_input_report(priv, vpc_bit);
+ pr_info("Unknown event: %lu\n", vpc_bit);
}
}
}
--
1.7.9.5

2012-05-03 20:31:44

by Matthew Garrett

[permalink] [raw]
Subject: Re: [PATCH 0/2] ideapad: some minor fix

Merged for next, thanks.

--
Matthew Garrett | [email protected]