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
3ee20abb
Commit
3ee20abb
authored
Mar 10, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus
parents
c23663ac
844c9f47
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
drivers/spi/spi-rockchip.c
drivers/spi/spi-rockchip.c
+3
-0
No files found.
drivers/spi/spi-rockchip.c
View file @
3ee20abb
...
@@ -749,6 +749,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
...
@@ -749,6 +749,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
return
0
;
return
0
;
err_register_master:
err_register_master:
pm_runtime_disable
(
&
pdev
->
dev
);
if
(
rs
->
dma_tx
.
ch
)
if
(
rs
->
dma_tx
.
ch
)
dma_release_channel
(
rs
->
dma_tx
.
ch
);
dma_release_channel
(
rs
->
dma_tx
.
ch
);
if
(
rs
->
dma_rx
.
ch
)
if
(
rs
->
dma_rx
.
ch
)
...
@@ -778,6 +779,8 @@ static int rockchip_spi_remove(struct platform_device *pdev)
...
@@ -778,6 +779,8 @@ static int rockchip_spi_remove(struct platform_device *pdev)
if
(
rs
->
dma_rx
.
ch
)
if
(
rs
->
dma_rx
.
ch
)
dma_release_channel
(
rs
->
dma_rx
.
ch
);
dma_release_channel
(
rs
->
dma_rx
.
ch
);
spi_master_put
(
master
);
return
0
;
return
0
;
}
}
...
...
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