projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hid
/
hid-lg3ff.c
diff --git
a/drivers/hid/hid-lg3ff.c
b/drivers/hid/hid-lg3ff.c
index f98644c26c1dfc2ccc181a23fee0d94b6c6e03ef..e52f181f6aa14dd4fd8229ce2ecb379ccf80533c 100644
(file)
--- a/
drivers/hid/hid-lg3ff.c
+++ b/
drivers/hid/hid-lg3ff.c
@@
-22,10
+22,8
@@
#include <linux/input.h>
#include <linux/input.h>
-#include <linux/usb.h>
#include <linux/hid.h>
#include <linux/hid.h>
-#include "usbhid/usbhid.h"
#include "hid-lg.h"
/*
#include "hid-lg.h"
/*
@@
-92,7
+90,7
@@
static int hid_lg3ff_play(struct input_dev *dev, void *data,
report->field[0]->value[1] = (unsigned char)(-x);
report->field[0]->value[31] = (unsigned char)(-y);
report->field[0]->value[1] = (unsigned char)(-x);
report->field[0]->value[31] = (unsigned char)(-y);
-
usbhid_submit_report(hid, report, USB_DIR_OU
T);
+
hid_hw_request(hid, report, HID_REQ_SET_REPOR
T);
break;
}
return 0;
break;
}
return 0;
@@
-118,7
+116,7
@@
static void hid_lg3ff_set_autocenter(struct input_dev *dev, u16 magnitude)
report->field[0]->value[33] = 0x7F;
report->field[0]->value[34] = 0x7F;
report->field[0]->value[33] = 0x7F;
report->field[0]->value[34] = 0x7F;
-
usbhid_submit_report(hid, report, USB_DIR_OU
T);
+
hid_hw_request(hid, report, HID_REQ_SET_REPOR
T);
}
}