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
130555cf
Commit
130555cf
authored
Nov 10, 2017
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'spi/fix/idr' and 'spi/fix/sh-msiof' into spi-linus
parents
39dae59d
42bdd706
36735783
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
drivers/spi/spi-sh-msiof.c
drivers/spi/spi-sh-msiof.c
+1
-1
drivers/spi/spi.c
drivers/spi/spi.c
+3
-2
No files found.
drivers/spi/spi-sh-msiof.c
View file @
130555cf
...
...
@@ -900,7 +900,7 @@ static int sh_msiof_transfer_one(struct spi_master *master,
break
;
copy32
=
copy_bswap32
;
}
else
if
(
bits
<=
16
)
{
if
(
l
&
1
)
if
(
l
&
3
)
break
;
copy32
=
copy_wswap32
;
}
else
{
...
...
drivers/spi/spi.c
View file @
130555cf
...
...
@@ -2245,11 +2245,12 @@ static int __unregister(struct device *dev, void *null)
void
spi_unregister_controller
(
struct
spi_controller
*
ctlr
)
{
struct
spi_controller
*
found
;
int
id
=
ctlr
->
bus_num
;
int
dummy
;
/* First make sure that this controller was ever added */
mutex_lock
(
&
board_lock
);
found
=
idr_find
(
&
spi_master_idr
,
ctlr
->
bus_num
);
found
=
idr_find
(
&
spi_master_idr
,
id
);
mutex_unlock
(
&
board_lock
);
if
(
found
!=
ctlr
)
{
dev_dbg
(
&
ctlr
->
dev
,
...
...
@@ -2269,7 +2270,7 @@ void spi_unregister_controller(struct spi_controller *ctlr)
device_unregister
(
&
ctlr
->
dev
);
/* free bus id */
mutex_lock
(
&
board_lock
);
idr_remove
(
&
spi_master_idr
,
ctlr
->
bus_num
);
idr_remove
(
&
spi_master_idr
,
id
);
mutex_unlock
(
&
board_lock
);
}
EXPORT_SYMBOL_GPL
(
spi_unregister_controller
);
...
...
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