Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91853
b: refs/heads/master
c: 282bfd4
h: refs/heads/master
i:
  91851: b04a097
v: v3
  • Loading branch information
Jiri Slaby authored and Jiri Kosina committed Apr 22, 2008
1 parent bc2e88a commit b7d5ddd
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 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: 377e10fbb4ef219f540d06796e9fb0d3ec35a58f
refs/heads/master: 282bfd4cbcc2bbeb1a2cad1f42debd378e0b5ac9
2 changes: 1 addition & 1 deletion trunk/drivers/hid/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned
field->index = report->maxfield++;
report->field[field->index] = field;
field->usage = (struct hid_usage *)(field + 1);
field->value = (unsigned *)(field->usage + usages);
field->value = (s32 *)(field->usage + usages);
field->report = report;

return field;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/hid/hid-input-quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ static const struct hid_input_blacklist {

{ VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },

{ 0, 0, 0 }
{ 0, 0, NULL }
};

int hidinput_mapping_quirks(struct hid_usage *usage,
Expand Down
9 changes: 5 additions & 4 deletions trunk/drivers/hid/usbhid/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,10 +610,11 @@ static void usbhid_set_leds(struct hid_device *hid)
/*
* Traverse the supplied list of reports and find the longest
*/
static void hid_find_max_report(struct hid_device *hid, unsigned int type, int *max)
static void hid_find_max_report(struct hid_device *hid, unsigned int type,
unsigned int *max)
{
struct hid_report *report;
int size;
unsigned int size;

list_for_each_entry(report, &hid->report_enum[type].report_list, list) {
size = ((report->size - 1) >> 3) + 1;
Expand Down Expand Up @@ -705,9 +706,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
struct hid_descriptor *hdesc;
struct hid_device *hid;
u32 quirks = 0;
unsigned rsize = 0;
unsigned int insize = 0, rsize = 0;
char *rdesc;
int n, len, insize = 0;
int n, len;
struct usbhid_device *usbhid;

quirks = usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
Expand Down

0 comments on commit b7d5ddd

Please sign in to comment.