From b8a6d4f3c85eed5b22cb534fc63ead226ea8e5dc Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Tue, 21 Aug 2012 20:22:44 +0200 Subject: [PATCH] --- yaml --- r: 323471 b: refs/heads/master c: 8db089d1b08209c04cd130e49fa4796b5513ce7f h: refs/heads/master i: 323469: 127d925b298645aa9392df5fbd20260926a52e78 323467: 97cbad955f6e098515ae87a55a947f8266372095 323463: 1f6cf4e9fe40212eff23e10884199ceaf082c5e3 323455: 6846110fc1446a4041647057138cb4b7626d8984 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-debug.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0c6461871c6c..1ff047ce015b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0be5b3bac6376ea55bfcbac04cc521428043742 +refs/heads/master: 8db089d1b08209c04cd130e49fa4796b5513ce7f diff --git a/trunk/drivers/hid/hid-debug.c b/trunk/drivers/hid/hid-debug.c index 01dd9a7daf7a..933fff0fff1f 100644 --- a/trunk/drivers/hid/hid-debug.c +++ b/trunk/drivers/hid/hid-debug.c @@ -911,15 +911,21 @@ static void hid_dump_input_mapping(struct hid_device *hid, struct seq_file *f) } - static int hid_debug_rdesc_show(struct seq_file *f, void *p) { struct hid_device *hdev = f->private; + const __u8 *rdesc = hdev->rdesc; + unsigned rsize = hdev->rsize; int i; + if (!rdesc) { + rdesc = hdev->dev_rdesc; + rsize = hdev->dev_rsize; + } + /* dump HID report descriptor */ - for (i = 0; i < hdev->rsize; i++) - seq_printf(f, "%02x ", hdev->rdesc[i]); + for (i = 0; i < rsize; i++) + seq_printf(f, "%02x ", rdesc[i]); seq_printf(f, "\n\n"); /* dump parsed data and input mappings */