diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-04-15 07:51:49 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 07:51:49 +0200 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /drivers/hid/hid-debug.c | |
| parent | Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into... (diff) | |
| parent | Linux 5.1-rc5 (diff) | |
| download | linux-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.tar.xz linux-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.zip | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/hid/hid-debug.c')
| -rw-r--r-- | drivers/hid/hid-debug.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index ac9fda1b5a72..1384e57182af 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -1060,10 +1060,15 @@ static int hid_debug_rdesc_show(struct seq_file *f, void *p) seq_printf(f, "\n\n"); /* dump parsed data and input mappings */ + if (down_interruptible(&hdev->driver_input_lock)) + return 0; + hid_dump_device(hdev, f); seq_printf(f, "\n"); hid_dump_input_mapping(hdev, f); + up(&hdev->driver_input_lock); + return 0; } |