diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
| commit | 2040cf9f59037aa8aec749363e69ead165b67b43 (patch) | |
| tree | e9c15448e841cc493bc80b9f658d7955623e86dd /drivers/usb/chipidea/debug.c | |
| parent | f66c0447cca1281116224d474cdb37d6a18e4b5b (diff) | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a (diff) | |
Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/chipidea/debug.c')
| -rw-r--r-- | drivers/usb/chipidea/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c index fcc91a338875..e0376ee646ad 100644 --- a/drivers/usb/chipidea/debug.c +++ b/drivers/usb/chipidea/debug.c @@ -342,7 +342,7 @@ DEFINE_SHOW_ATTRIBUTE(ci_registers); */ void dbg_create_files(struct ci_hdrc *ci) { - ci->debugfs = debugfs_create_dir(dev_name(ci->dev), NULL); + ci->debugfs = debugfs_create_dir(dev_name(ci->dev), usb_debug_root); debugfs_create_file("device", S_IRUGO, ci->debugfs, ci, &ci_device_fops); |