From e2221f8bf4339c595791bd3ef9b29c361894e805 Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Fri, 30 Jul 2010 15:07:42 +0400
Subject: [PATCH] --- yaml --- r: 206058 b: refs/heads/master c:
 94f5659cfa4f14ba901fbbb8a57d0145754d0d37 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/octeon/ethernet-spi.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7c755f845dce..c26d8f05808a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d049431e08a847a222e20f406332529751b4365
+refs/heads/master: 94f5659cfa4f14ba901fbbb8a57d0145754d0d37
diff --git a/trunk/drivers/staging/octeon/ethernet-spi.c b/trunk/drivers/staging/octeon/ethernet-spi.c
index b58b8971f939..970825421884 100644
--- a/trunk/drivers/staging/octeon/ethernet-spi.c
+++ b/trunk/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++;