Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 323480
b: refs/heads/master
c: 2575155
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Jiri Kosina committed Sep 17, 2012
1 parent 4d8e438 commit 18a7550
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e2e78e71d1a3d721beaaab591f3d6c4886ef21a4
refs/heads/master: 2575155309947063927b123c56119f36dfda3b50
10 changes: 5 additions & 5 deletions trunk/drivers/hid/hid-lg.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static __u8 dfp_rdesc_fixed[] = {
static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,
unsigned int *rsize)
{
struct lg_drv_data *drv_data = (struct lg_drv_data *)hid_get_drvdata(hdev);
struct lg_drv_data *drv_data = hid_get_drvdata(hdev);

if ((drv_data->quirks & LG_RDESC) && *rsize >= 90 && rdesc[83] == 0x26 &&
rdesc[84] == 0x8c && rdesc[85] == 0x02) {
Expand Down Expand Up @@ -277,7 +277,7 @@ static int lg_input_mapping(struct hid_device *hdev, struct hid_input *hi,
0, 0, 0, 0, 0,183,184,185,186,187,
188,189,190,191,192,193,194, 0, 0, 0
};
struct lg_drv_data *drv_data = (struct lg_drv_data *)hid_get_drvdata(hdev);
struct lg_drv_data *drv_data = hid_get_drvdata(hdev);
unsigned int hid = usage->hid;

if (hdev->product == USB_DEVICE_ID_LOGITECH_RECEIVER &&
Expand Down Expand Up @@ -318,7 +318,7 @@ static int lg_input_mapped(struct hid_device *hdev, struct hid_input *hi,
struct hid_field *field, struct hid_usage *usage,
unsigned long **bit, int *max)
{
struct lg_drv_data *drv_data = (struct lg_drv_data *)hid_get_drvdata(hdev);
struct lg_drv_data *drv_data = hid_get_drvdata(hdev);

if ((drv_data->quirks & LG_BAD_RELATIVE_KEYS) && usage->type == EV_KEY &&
(field->flags & HID_MAIN_ITEM_RELATIVE))
Expand All @@ -334,7 +334,7 @@ static int lg_input_mapped(struct hid_device *hdev, struct hid_input *hi,
static int lg_event(struct hid_device *hdev, struct hid_field *field,
struct hid_usage *usage, __s32 value)
{
struct lg_drv_data *drv_data = (struct lg_drv_data *)hid_get_drvdata(hdev);
struct lg_drv_data *drv_data = hid_get_drvdata(hdev);

if ((drv_data->quirks & LG_INVERT_HWHEEL) && usage->code == REL_HWHEEL) {
input_event(field->hidinput->input, usage->type, usage->code,
Expand Down Expand Up @@ -415,7 +415,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)

static void lg_remove(struct hid_device *hdev)
{
struct lg_drv_data *drv_data = (struct lg_drv_data *)hid_get_drvdata(hdev);
struct lg_drv_data *drv_data = hid_get_drvdata(hdev);
if (drv_data->quirks & LG_FF4)
lg4ff_deinit(hdev);

Expand Down

0 comments on commit 18a7550

Please sign in to comment.