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
Kirill Smelkov
linux
Commits
b4e8c0b1
Commit
b4e8c0b1
authored
Oct 25, 2019
by
Rob Herring
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dt/linus' into dt/next
parents
58fbe999
5dba5175
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
drivers/of/of_reserved_mem.c
drivers/of/of_reserved_mem.c
+3
-1
drivers/of/unittest.c
drivers/of/unittest.c
+1
-0
No files found.
drivers/of/of_reserved_mem.c
View file @
b4e8c0b1
...
@@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
...
@@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
if
(
!
target
)
if
(
!
target
)
return
-
ENODEV
;
return
-
ENODEV
;
if
(
!
of_device_is_available
(
target
))
if
(
!
of_device_is_available
(
target
))
{
of_node_put
(
target
);
return
0
;
return
0
;
}
rmem
=
__find_rmem
(
target
);
rmem
=
__find_rmem
(
target
);
of_node_put
(
target
);
of_node_put
(
target
);
...
...
drivers/of/unittest.c
View file @
b4e8c0b1
...
@@ -1297,6 +1297,7 @@ static int __init unittest_data_add(void)
...
@@ -1297,6 +1297,7 @@ static int __init unittest_data_add(void)
of_fdt_unflatten_tree
(
unittest_data
,
NULL
,
&
unittest_data_node
);
of_fdt_unflatten_tree
(
unittest_data
,
NULL
,
&
unittest_data_node
);
if
(
!
unittest_data_node
)
{
if
(
!
unittest_data_node
)
{
pr_warn
(
"%s: No tree to attach; not running tests
\n
"
,
__func__
);
pr_warn
(
"%s: No tree to attach; not running tests
\n
"
,
__func__
);
kfree
(
unittest_data
);
return
-
ENODATA
;
return
-
ENODATA
;
}
}
...
...
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