aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-logitech-dj.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid/hid-logitech-dj.c')
-rw-r--r--drivers/hid/hid-logitech-dj.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 2e5302462efb..a7947d8251a8 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -542,9 +542,9 @@ static int logi_dj_output_hidraw_report(struct hid_device *hid, u8 * buf,
542 return 0; 542 return 0;
543} 543}
544 544
545static void rdcat(char **rdesc, unsigned int *rsize, const char *data, unsigned int size) 545static void rdcat(char *rdesc, unsigned int *rsize, const char *data, unsigned int size)
546{ 546{
547 memcpy(*rdesc + *rsize, data, size); 547 memcpy(rdesc + *rsize, data, size);
548 *rsize += size; 548 *rsize += size;
549} 549}
550 550
@@ -567,31 +567,31 @@ static int logi_dj_ll_parse(struct hid_device *hid)
567 if (djdev->reports_supported & STD_KEYBOARD) { 567 if (djdev->reports_supported & STD_KEYBOARD) {
568 dbg_hid("%s: sending a kbd descriptor, reports_supported: %x\n", 568 dbg_hid("%s: sending a kbd descriptor, reports_supported: %x\n",
569 __func__, djdev->reports_supported); 569 __func__, djdev->reports_supported);
570 rdcat(&rdesc, &rsize, kbd_descriptor, sizeof(kbd_descriptor)); 570 rdcat(rdesc, &rsize, kbd_descriptor, sizeof(kbd_descriptor));
571 } 571 }
572 572
573 if (djdev->reports_supported & STD_MOUSE) { 573 if (djdev->reports_supported & STD_MOUSE) {
574 dbg_hid("%s: sending a mouse descriptor, reports_supported: " 574 dbg_hid("%s: sending a mouse descriptor, reports_supported: "
575 "%x\n", __func__, djdev->reports_supported); 575 "%x\n", __func__, djdev->reports_supported);
576 rdcat(&rdesc, &rsize, mse_descriptor, sizeof(mse_descriptor)); 576 rdcat(rdesc, &rsize, mse_descriptor, sizeof(mse_descriptor));
577 } 577 }
578 578
579 if (djdev->reports_supported & MULTIMEDIA) { 579 if (djdev->reports_supported & MULTIMEDIA) {
580 dbg_hid("%s: sending a multimedia report descriptor: %x\n", 580 dbg_hid("%s: sending a multimedia report descriptor: %x\n",
581 __func__, djdev->reports_supported); 581 __func__, djdev->reports_supported);
582 rdcat(&rdesc, &rsize, consumer_descriptor, sizeof(consumer_descriptor)); 582 rdcat(rdesc, &rsize, consumer_descriptor, sizeof(consumer_descriptor));
583 } 583 }
584 584
585 if (djdev->reports_supported & POWER_KEYS) { 585 if (djdev->reports_supported & POWER_KEYS) {
586 dbg_hid("%s: sending a power keys report descriptor: %x\n", 586 dbg_hid("%s: sending a power keys report descriptor: %x\n",
587 __func__, djdev->reports_supported); 587 __func__, djdev->reports_supported);
588 rdcat(&rdesc, &rsize, syscontrol_descriptor, sizeof(syscontrol_descriptor)); 588 rdcat(rdesc, &rsize, syscontrol_descriptor, sizeof(syscontrol_descriptor));
589 } 589 }
590 590
591 if (djdev->reports_supported & MEDIA_CENTER) { 591 if (djdev->reports_supported & MEDIA_CENTER) {
592 dbg_hid("%s: sending a media center report descriptor: %x\n", 592 dbg_hid("%s: sending a media center report descriptor: %x\n",
593 __func__, djdev->reports_supported); 593 __func__, djdev->reports_supported);
594 rdcat(&rdesc, &rsize, media_descriptor, sizeof(media_descriptor)); 594 rdcat(rdesc, &rsize, media_descriptor, sizeof(media_descriptor));
595 } 595 }
596 596
597 if (djdev->reports_supported & KBD_LEDS) { 597 if (djdev->reports_supported & KBD_LEDS) {