aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKulikov Vasiliy <segooon@gmail.com>2010-07-30 07:07:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-02 21:23:44 -0400
commit94f5659cfa4f14ba901fbbb8a57d0145754d0d37 (patch)
treead060a3bf814833b19312e0702c5e5d60a7aad00
parent3d049431e08a847a222e20f406332529751b4365 (diff)
staging: octeon: check request_irq() return value
request_irq() may fail, if so propagate error code. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Acked-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/octeon/ethernet-spi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c
index b58b8971f939..970825421884 100644
--- 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)
294 if (number_spi_ports == 0) { 294 if (number_spi_ports == 0) {
295 r = request_irq(OCTEON_IRQ_RML, cvm_oct_spi_rml_interrupt, 295 r = request_irq(OCTEON_IRQ_RML, cvm_oct_spi_rml_interrupt,
296 IRQF_SHARED, "SPI", &number_spi_ports); 296 IRQF_SHARED, "SPI", &number_spi_ports);
297 if (r)
298 return r;
297 } 299 }
298 number_spi_ports++; 300 number_spi_ports++;
299 301