Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
hid
/
hid-uclogic.c
diff --git
a/kernel/drivers/hid/hid-uclogic.c
b/kernel/drivers/hid/hid-uclogic.c
index
b905d50
..
85ac435
100644
(file)
--- a/
kernel/drivers/hid/hid-uclogic.c
+++ b/
kernel/drivers/hid/hid-uclogic.c
@@
-731,7
+731,7
@@
static int uclogic_input_mapping(struct hid_device *hdev, struct hid_input *hi,
return 0;
}
return 0;
}
-static
void
uclogic_input_configured(struct hid_device *hdev,
+static
int
uclogic_input_configured(struct hid_device *hdev,
struct hid_input *hi)
{
char *name;
struct hid_input *hi)
{
char *name;
@@
-741,7
+741,7
@@
static void uclogic_input_configured(struct hid_device *hdev,
/* no report associated (HID_QUIRK_MULTI_INPUT not set) */
if (!hi->report)
/* no report associated (HID_QUIRK_MULTI_INPUT not set) */
if (!hi->report)
- return;
+ return
0
;
field = hi->report->field[0];
field = hi->report->field[0];
@@
-774,6
+774,8
@@
static void uclogic_input_configured(struct hid_device *hdev,
hi->input->name = name;
}
}
hi->input->name = name;
}
}
+
+ return 0;
}
/**
}
/**