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
56432b73
Commit
56432b73
authored
Jul 24, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
parents
1cb2e848
d3364847
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
drivers/spi/spi-xilinx.c
drivers/spi/spi-xilinx.c
+6
-2
No files found.
drivers/spi/spi-xilinx.c
View file @
56432b73
...
...
@@ -341,9 +341,10 @@ static irqreturn_t xilinx_spi_irq(int irq, void *dev_id)
if
(
ipif_isr
&
XSPI_INTR_TX_EMPTY
)
{
/* Transmission completed */
complete
(
&
xspi
->
done
);
return
IRQ_HANDLED
;
}
return
IRQ_
HANDLED
;
return
IRQ_
NONE
;
}
static
int
xilinx_spi_find_buffer_size
(
struct
xilinx_spi
*
xspi
)
...
...
@@ -455,7 +456,10 @@ static int xilinx_spi_probe(struct platform_device *pdev)
xspi
->
buffer_size
=
xilinx_spi_find_buffer_size
(
xspi
);
xspi
->
irq
=
platform_get_irq
(
pdev
,
0
);
if
(
xspi
->
irq
>=
0
)
{
if
(
xspi
->
irq
<
0
&&
xspi
->
irq
!=
-
ENXIO
)
{
ret
=
xspi
->
irq
;
goto
put_master
;
}
else
if
(
xspi
->
irq
>=
0
)
{
/* Register for SPI Interrupt */
ret
=
devm_request_irq
(
&
pdev
->
dev
,
xspi
->
irq
,
xilinx_spi_irq
,
0
,
dev_name
(
&
pdev
->
dev
),
xspi
);
...
...
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