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
19a03680
Commit
19a03680
authored
Dec 08, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'spi/topic/core' into spi-next
parents
c9508d4b
98a8f5a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
drivers/spi/spi.c
drivers/spi/spi.c
+1
-1
include/linux/spi/spi.h
include/linux/spi/spi.h
+6
-0
No files found.
drivers/spi/spi.c
View file @
19a03680
...
...
@@ -1001,7 +1001,7 @@ static int spi_init_queue(struct spi_master *master)
dev_name
(
&
master
->
dev
));
if
(
IS_ERR
(
master
->
kworker_task
))
{
dev_err
(
&
master
->
dev
,
"failed to create message pump task
\n
"
);
return
-
ENOMEM
;
return
PTR_ERR
(
master
->
kworker_task
)
;
}
init_kthread_work
(
&
master
->
pump_messages
,
spi_pump_messages
);
...
...
include/linux/spi/spi.h
View file @
19a03680
...
...
@@ -1049,4 +1049,10 @@ spi_unregister_device(struct spi_device *spi)
extern
const
struct
spi_device_id
*
spi_get_device_id
(
const
struct
spi_device
*
sdev
);
static
inline
bool
spi_transfer_is_last
(
struct
spi_master
*
master
,
struct
spi_transfer
*
xfer
)
{
return
list_is_last
(
&
xfer
->
transfer_list
,
&
master
->
cur_msg
->
transfers
);
}
#endif
/* __LINUX_SPI_H */
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