aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid/hid-input.c')
-rw-r--r--drivers/hid/hid-input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d97f2323af57..a713e6211419 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1178,7 +1178,7 @@ static void hidinput_led_worker(struct work_struct *work)
1178 1178
1179 /* fall back to generic raw-output-report */ 1179 /* fall back to generic raw-output-report */
1180 len = ((report->size - 1) >> 3) + 1 + (report->id > 0); 1180 len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
1181 buf = kmalloc(len, GFP_KERNEL); 1181 buf = hid_alloc_report_buf(report, GFP_KERNEL);
1182 if (!buf) 1182 if (!buf)
1183 return; 1183 return;
1184 1184
@@ -1279,7 +1279,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid)
1279 input_dev->id.vendor = hid->vendor; 1279 input_dev->id.vendor = hid->vendor;
1280 input_dev->id.product = hid->product; 1280 input_dev->id.product = hid->product;
1281 input_dev->id.version = hid->version; 1281 input_dev->id.version = hid->version;
1282 input_dev->dev.parent = hid->dev.parent; 1282 input_dev->dev.parent = &hid->dev;
1283 hidinput->input = input_dev; 1283 hidinput->input = input_dev;
1284 list_add_tail(&hidinput->list, &hid->inputs); 1284 list_add_tail(&hidinput->list, &hid->inputs);
1285 1285