On Tue, Jan 21, 2014 at 10:40:45PM -0800, Dmitry Torokhov wrote:
> I think this should be
>
> error = kstrtoint(buf, 10, &new_speed);
> if (error)
> return error;
>
I just lost my SSD/branch, so here is a fresh patch for mainline:
Fixed some coding style issues, removed unessecary spaces, added
linebreaks, converted an occurence of sscanf to kstrtoint.
Signed-off-by: Robin Schroer <sulamiificat...@gmail.com>
---
drivers/hid/hid-wacom.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 60c75dc..c7f9d1c 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -77,8 +77,8 @@ static void wacom_scramble(__u8 *image)
__u16 mask;
__u16 s1;
__u16 s2;
- __u16 r1 ;
- __u16 r2 ;
+ __u16 r1;
+ __u16 r2;
__u16 r;
__u8 buf[256];
int i, w, x, y, z;
@@ -336,7 +336,8 @@ static void wacom_set_features(struct hid_device *hdev, u8
speed)
switch (hdev->product) {
case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:
- rep_data[0] = 0x03 ; rep_data[1] = 0x00;
+ rep_data[0] = 0x03;
+ rep_data[1] = 0x00;
limit = 3;
do {
ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
@@ -403,9 +404,11 @@ static ssize_t wacom_store_speed(struct device *dev,
{
struct hid_device *hdev = container_of(dev, struct hid_device, dev);
int new_speed;
+ int error;
- if (sscanf(buf, "%1d", &new_speed ) != 1)
- return -EINVAL;
+ error = kstrtoint(buf, 10, &new_speed);
+ if (error)
+ return error;
if (new_speed == 0 || new_speed == 1) {
wacom_set_features(hdev, new_speed);
--
1.8.4.2
--
Robin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
