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
25a94877
Commit
25a94877
authored
Sep 29, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regmap/fix/core' into regmap-linus
parents
fe82dcec
d6b41cb0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
drivers/base/regmap/regmap.c
drivers/base/regmap/regmap.c
+5
-2
No files found.
drivers/base/regmap/regmap.c
View file @
25a94877
...
...
@@ -1408,7 +1408,7 @@ int _regmap_write(struct regmap *map, unsigned int reg,
}
#ifdef LOG_DEVICE
if
(
strcmp
(
dev_name
(
map
->
dev
),
LOG_DEVICE
)
==
0
)
if
(
map
->
dev
&&
strcmp
(
dev_name
(
map
->
dev
),
LOG_DEVICE
)
==
0
)
dev_info
(
map
->
dev
,
"%x <= %x
\n
"
,
reg
,
val
);
#endif
...
...
@@ -1659,6 +1659,9 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
}
else
{
void
*
wval
;
if
(
!
val_count
)
return
-
EINVAL
;
wval
=
kmemdup
(
val
,
val_count
*
val_bytes
,
GFP_KERNEL
);
if
(
!
wval
)
{
dev_err
(
map
->
dev
,
"Error in memory allocation
\n
"
);
...
...
@@ -2058,7 +2061,7 @@ static int _regmap_read(struct regmap *map, unsigned int reg,
ret
=
map
->
reg_read
(
context
,
reg
,
val
);
if
(
ret
==
0
)
{
#ifdef LOG_DEVICE
if
(
strcmp
(
dev_name
(
map
->
dev
),
LOG_DEVICE
)
==
0
)
if
(
map
->
dev
&&
strcmp
(
dev_name
(
map
->
dev
),
LOG_DEVICE
)
==
0
)
dev_info
(
map
->
dev
,
"%x => %x
\n
"
,
reg
,
*
val
);
#endif
...
...
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