OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97bf6af
)
spi: match var type to return type of wait_for_completion
author
Nicholas Mc Guire
<der.herr@hofr.at>
Mon, 2 Feb 2015 08:30:32 +0000
(
03:30
-0500)
committer
Mark Brown
<broonie@kernel.org>
Wed, 4 Feb 2015 20:52:32 +0000
(20:52 +0000)
return type of wait_for_completion_timeout is unsigned long not int, this
patch changes the type of m from int to unsigned long.
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi.c
b/drivers/spi/spi.c
index
66a70e9
..
ba17929
100644
(file)
--- a/
drivers/spi/spi.c
+++ b/
drivers/spi/spi.c
@@
-788,7
+788,7
@@
static int spi_transfer_one_message(struct spi_master *master,
struct spi_transfer *xfer;
bool keep_cs = false;
int ret = 0;
-
int
ms = 1;
+
unsigned long
ms = 1;
spi_set_cs(msg->spi, true);