aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8e5f9bbdf4d..8da3a306d0c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 12
-EXTRAVERSION =-rc2
+EXTRAVERSION =-rc3
NAME=Woozy Numbat
# *DOCUMENTATION*
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index d74b99dab7e..e60f9338e44 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/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;