git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
staging
/
octeon
/
ethernet-spi.c
diff --git
a/drivers/staging/octeon/ethernet-spi.c
b/drivers/staging/octeon/ethernet-spi.c
index
b58b897
..
9708254
100644
(file)
--- a/
drivers/staging/octeon/ethernet-spi.c
+++ b/
drivers/staging/octeon/ethernet-spi.c
@@
-294,6
+294,8
@@
int cvm_oct_spi_init(struct net_device *dev)
if (number_spi_ports == 0) {
r = request_irq(OCTEON_IRQ_RML, cvm_oct_spi_rml_interrupt,
IRQF_SHARED, "SPI", &number_spi_ports);
+ if (r)
+ return r;
}
number_spi_ports++;