From 12ba687301090c442557ef22369556e0e7fe2626 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 21 Apr 2005 07:36:42 -0700
Subject: [PATCH] --- yaml --- r: 343 b: refs/heads/master c:
 6d9c5d94d39a09d9b112613f0bfdb9af0e6dc253 h: refs/heads/master i:   341:
 45f2c48a988888e3f1eba88b8d054013e0610c00   339:
 0f5122279b976fb6de829ef772b69968407f8723   335:
 115ea9198437cbffb0025d11d7e9b77f5c1bde4e v: v3

---
 [refs]                                   | 2 +-
 trunk/Makefile                           | 2 +-
 trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1a130997ab3c..7c4950a2b4d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 489ec5f5d59b306e4ccc505eac417526adedb438
+refs/heads/master: 6d9c5d94d39a09d9b112613f0bfdb9af0e6dc253
diff --git a/trunk/Makefile b/trunk/Makefile
index 8e5f9bbdf4de..8da3a306d0c0 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 12
-EXTRAVERSION =-rc2
+EXTRAVERSION =-rc3
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*
diff --git a/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c b/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c
index d74b99dab7ec..e60f9338e44a 100644
--- a/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/trunk/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -3605,9 +3605,8 @@ ahc_linux_init(void)
 	ahc_linux_transport_template = spi_attach_transport(&ahc_linux_transport_functions);
 	if (!ahc_linux_transport_template)
 		return -ENODEV;
-	int rc = ahc_linux_detect(&aic7xxx_driver_template);
-	if (rc)
-		return rc;
+	if (ahc_linux_detect(&aic7xxx_driver_template))
+		return 0;
 	spi_release_transport(ahc_linux_transport_template);
 	ahc_linux_exit();
 	return -ENODEV;