diff --git a/[refs] b/[refs] index b30f8faa77d5..97dcbc54106a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35068976916fdef82d6e69ef1f8c9a1c47732759 +refs/heads/master: d6509c36ba333282362e5f9769869f8a8d790aaf diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index 18c2b3cf6bcc..2fcfdbb43cd3 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -656,7 +656,7 @@ struct hid_device *hid_parse_report(__u8 *start, unsigned size) for (i = 0; i < HID_REPORT_TYPES; i++) INIT_LIST_HEAD(&device->report_enum[i].report_list); - if (!(device->rdesc = (__u8 *)kmalloc(size, GFP_KERNEL))) { + if (!(device->rdesc = kmalloc(size, GFP_KERNEL))) { kfree(device->collection); kfree(device); return NULL;