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
86e41a29
Commit
86e41a29
authored
Jan 12, 2018
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
parents
b2cd1df6
4c90f297
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
drivers/base/regmap/regmap.c
drivers/base/regmap/regmap.c
+4
-2
No files found.
drivers/base/regmap/regmap.c
View file @
86e41a29
...
...
@@ -2423,13 +2423,15 @@ static int _regmap_bus_read(void *context, unsigned int reg,
{
int
ret
;
struct
regmap
*
map
=
context
;
void
*
work_val
=
map
->
work_buf
+
map
->
format
.
reg_bytes
+
map
->
format
.
pad_bytes
;
if
(
!
map
->
format
.
parse_val
)
return
-
EINVAL
;
ret
=
_regmap_raw_read
(
map
,
reg
,
map
->
work_buf
,
map
->
format
.
val_bytes
);
ret
=
_regmap_raw_read
(
map
,
reg
,
work_val
,
map
->
format
.
val_bytes
);
if
(
ret
==
0
)
*
val
=
map
->
format
.
parse_val
(
map
->
work_buf
);
*
val
=
map
->
format
.
parse_val
(
work_val
);
return
ret
;
}
...
...
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