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
d9424d6d
Commit
d9424d6d
authored
May 23, 2019
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'spi-5.2' into spi-5.3
parents
0e896f38
f3440d9a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
drivers/spi/spi-bitbang.c
drivers/spi/spi-bitbang.c
+1
-1
drivers/spi/spi-fsl-spi.c
drivers/spi/spi-fsl-spi.c
+1
-1
drivers/spi/spi.c
drivers/spi/spi.c
+8
-3
No files found.
drivers/spi/spi-bitbang.c
View file @
d9424d6d
...
@@ -415,7 +415,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
...
@@ -415,7 +415,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
if
(
ret
)
if
(
ret
)
spi_master_put
(
master
);
spi_master_put
(
master
);
return
0
;
return
ret
;
}
}
EXPORT_SYMBOL_GPL
(
spi_bitbang_start
);
EXPORT_SYMBOL_GPL
(
spi_bitbang_start
);
...
...
drivers/spi/spi-fsl-spi.c
View file @
d9424d6d
...
@@ -432,7 +432,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
...
@@ -432,7 +432,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
}
}
m
->
status
=
status
;
m
->
status
=
status
;
spi_finalize_current_message
(
master
);
if
(
status
||
!
cs_change
)
{
if
(
status
||
!
cs_change
)
{
ndelay
(
nsecs
);
ndelay
(
nsecs
);
...
@@ -440,6 +439,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
...
@@ -440,6 +439,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
}
}
fsl_spi_setup_transfer
(
spi
,
NULL
);
fsl_spi_setup_transfer
(
spi
,
NULL
);
spi_finalize_current_message
(
master
);
return
0
;
return
0
;
}
}
...
...
drivers/spi/spi.c
View file @
d9424d6d
...
@@ -1229,10 +1229,10 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
...
@@ -1229,10 +1229,10 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
if
(
msg
->
status
&&
ctlr
->
handle_err
)
if
(
msg
->
status
&&
ctlr
->
handle_err
)
ctlr
->
handle_err
(
ctlr
,
msg
);
ctlr
->
handle_err
(
ctlr
,
msg
);
spi_finalize_current_message
(
ctlr
);
spi_res_release
(
ctlr
,
msg
);
spi_res_release
(
ctlr
,
msg
);
spi_finalize_current_message
(
ctlr
);
return
ret
;
return
ret
;
}
}
...
@@ -1355,10 +1355,15 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread)
...
@@ -1355,10 +1355,15 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread)
ret
=
ctlr
->
prepare_transfer_hardware
(
ctlr
);
ret
=
ctlr
->
prepare_transfer_hardware
(
ctlr
);
if
(
ret
)
{
if
(
ret
)
{
dev_err
(
&
ctlr
->
dev
,
dev_err
(
&
ctlr
->
dev
,
"failed to prepare transfer hardware
\n
"
);
"failed to prepare transfer hardware: %d
\n
"
,
ret
);
if
(
ctlr
->
auto_runtime_pm
)
if
(
ctlr
->
auto_runtime_pm
)
pm_runtime_put
(
ctlr
->
dev
.
parent
);
pm_runtime_put
(
ctlr
->
dev
.
parent
);
ctlr
->
cur_msg
->
status
=
ret
;
spi_finalize_current_message
(
ctlr
);
mutex_unlock
(
&
ctlr
->
io_mutex
);
mutex_unlock
(
&
ctlr
->
io_mutex
);
return
;
return
;
}
}
...
...
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