Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
18a64d84
Commit
18a64d84
authored
Sep 29, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regmap/fix/debugfs' into regmap-linus
parents
25a94877
18c0301f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
drivers/base/regmap/regmap-debugfs.c
drivers/base/regmap/regmap-debugfs.c
+6
-2
No files found.
drivers/base/regmap/regmap-debugfs.c
View file @
18a64d84
...
...
@@ -473,6 +473,7 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
{
struct
rb_node
*
next
;
struct
regmap_range_node
*
range_node
;
const
char
*
devname
=
"dummy"
;
/* If we don't have the debugfs root yet, postpone init */
if
(
!
regmap_debugfs_root
)
{
...
...
@@ -491,12 +492,15 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
INIT_LIST_HEAD
(
&
map
->
debugfs_off_cache
);
mutex_init
(
&
map
->
cache_lock
);
if
(
map
->
dev
)
devname
=
dev_name
(
map
->
dev
);
if
(
name
)
{
map
->
debugfs_name
=
kasprintf
(
GFP_KERNEL
,
"%s-%s"
,
dev
_name
(
map
->
dev
)
,
name
);
dev
name
,
name
);
name
=
map
->
debugfs_name
;
}
else
{
name
=
dev
_name
(
map
->
dev
)
;
name
=
dev
name
;
}
map
->
debugfs
=
debugfs_create_dir
(
name
,
regmap_debugfs_root
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment