From: Corentin Chary <corentin.chary@gmail.com>
To: platform-driver-x86@vger.kernel.org
Cc: Corentin Chary <corentin.chary@gmail.com>,
stable@kernel.org, Corentin Chary <corentincj@iksaif.net>,
Matthew Garrett <mjg@redhat.com>,
"open list:ASUS NOTEBOOKS AN..."
<acpi4asus-user@lists.sourceforge.net>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 01/16] asus-wmi: fix hwmon/pwm1
Date: Fri, 1 Jul 2011 11:34:26 +0200 [thread overview]
Message-ID: <1309512881-2901-2-git-send-email-corentin.chary@gmail.com> (raw)
In-Reply-To: <1309512881-2901-1-git-send-email-corentin.chary@gmail.com>
The code was completly broken, and should never had been sent
to the kernel. That's what happens when you write code without
hardware to test it.
Cc: stable@kernel.org
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
---
drivers/platform/x86/asus-wmi.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 00460cb..d1ddb4a 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -797,8 +797,8 @@ exit:
* Hwmon device
*/
static ssize_t asus_hwmon_pwm1(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+ struct device_attribute *attr,
+ char *buf)
{
struct asus_wmi *asus = dev_get_drvdata(dev);
u32 value;
@@ -809,7 +809,7 @@ static ssize_t asus_hwmon_pwm1(struct device *dev,
if (err < 0)
return err;
- value |= 0xFF;
+ value &= 0xFF;
if (value == 1) /* Low Speed */
value = 85;
@@ -869,7 +869,7 @@ static mode_t asus_hwmon_sysfs_is_visible(struct kobject *kobj,
* - reverved bits are non-zero
* - sfun and presence bit are not set
*/
- if (value != ASUS_WMI_UNSUPPORTED_METHOD || value & 0xFFF80000
+ if (value == ASUS_WMI_UNSUPPORTED_METHOD || value & 0xFFF80000
|| (!asus->sfun && !(value & ASUS_WMI_DSTS_PRESENCE_BIT)))
ok = false;
}
@@ -904,6 +904,7 @@ static int asus_wmi_hwmon_init(struct asus_wmi *asus)
pr_err("Could not register asus hwmon device\n");
return PTR_ERR(hwmon);
}
+ dev_set_drvdata(hwmon, asus);
asus->hwmon_device = hwmon;
result = sysfs_create_group(&hwmon->kobj, &hwmon_attribute_group);
if (result)
--
1.7.3.4
next prev parent reply other threads:[~2011-07-01 9:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-01 9:34 [PATCH 00/16] acpi4asus updates for 3.1 Corentin Chary
2011-07-01 9:34 ` Corentin Chary [this message]
2011-07-01 9:34 ` [PATCH 02/16] asus-wmi: Add callback for hotkey filtering Corentin Chary
2011-07-01 9:34 ` [PATCH 03/16] eeepc-wmi: Add support for T101MT Home/Express Gate key Corentin Chary
2011-07-01 9:34 ` [PATCH 04/16] asus-wmi: Enable autorepeat for hotkey input device Corentin Chary
2011-07-01 14:15 ` Matthew Garrett
2011-07-04 7:49 ` Corentin Chary
2011-07-01 9:34 ` [PATCH 05/16] asus-wmi: second part of the version starts at 16 not 8 Corentin Chary
2011-07-01 9:34 ` [PATCH 06/16] asus-wmi: add keyboard backlight support Corentin Chary
2011-07-01 9:34 ` [PATCH 07/16] asus-wmi: fix section mismatch Corentin Chary
2011-07-01 9:34 ` [PATCH 08/16] asus-wmi: set backlight type Corentin Chary
2011-07-01 9:34 ` [PATCH 09/16] asus-wmi: fix keyboard backlight detection Corentin Chary
2011-07-01 9:34 ` [PATCH 10/16] asus-wmi: add some device ids Corentin Chary
2011-07-01 9:34 ` [PATCH 11/16] asus-wmi: add thermal sensor Corentin Chary
2011-07-01 9:34 ` [PATCH 12/16] asus-wmi: check for temp1 presence Corentin Chary
2011-07-01 9:34 ` [PATCH 13/16] asus-wmi: return proper value in store_cpufv() Corentin Chary
2011-07-01 9:34 ` [PATCH 14/16] asus-wmi: add CWAP support and clarify the meaning of WAPF bits Corentin Chary
2011-07-01 9:34 ` [PATCH 15/16] asus-wmi: add gps rfkill support Corentin Chary
2011-07-01 9:34 ` [PATCH 16/16] asus-wmi: add uwb " Corentin Chary
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309512881-2901-2-git-send-email-corentin.chary@gmail.com \
--to=corentin.chary@gmail.com \
--cc=acpi4asus-user@lists.sourceforge.net \
--cc=corentincj@iksaif.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox