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
a25e29bd
Commit
a25e29bd
authored
Jan 13, 2020
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata
parents
9fc85a71
99477263
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
drivers/dma/ti/omap-dma.c
drivers/dma/ti/omap-dma.c
+4
-2
No files found.
drivers/dma/ti/omap-dma.c
View file @
a25e29bd
...
...
@@ -1658,8 +1658,10 @@ static int omap_dma_probe(struct platform_device *pdev)
if
(
conf
)
{
od
->
cfg
=
conf
;
od
->
plat
=
dev_get_platdata
(
&
pdev
->
dev
);
if
(
!
od
->
plat
)
dev_warn
(
&
pdev
->
dev
,
"no sdma auxdata needed?
\n
"
);
if
(
!
od
->
plat
)
{
dev_err
(
&
pdev
->
dev
,
"omap_system_dma_plat_info is missing"
);
return
-
ENODEV
;
}
}
else
{
od
->
cfg
=
&
default_cfg
;
...
...
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