Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[sfrench/cifs-2.6.git] / drivers / staging / octeon / ethernet-spi.c

diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c
index b58b8971f93938327e28e0c9761024ce7913ca2d..970825421884d44526385d7782d4faa40207501c 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++;