---

yaml --- r: 343 b: refs/heads/master c: 6d9c5d9 h: refs/heads/master i: 341: 45f2c48 339: 0f51222 335: 115ea91 v: v3
git-mirror · Apr 21, 2005 · 12ba687 · 12ba687
1 parent d65cbe5
commit 12ba687
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 489ec5f5d59b306e4ccc505eac417526adedb438
+refs/heads/master: 6d9c5d94d39a09d9b112613f0bfdb9af0e6dc253
diff --git 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
@@ -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;