From: James Bottomley <James.Bottomley@SteelEye.com>
Date: Thu, 21 Apr 2005 14:35:45 +0000 (-0700)
Subject: [PATCH] Fix aic7xxx_osm.c compile with older gcc's
X-Git-Tag: v2.6.12-rc4~297
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=858eaca169ed5e7b1b14eebb889323e75a02af0e;p=linux-2.6

[PATCH] Fix aic7xxx_osm.c compile with older gcc's

My version of gcc doesn't warn about this error (declaration in the
middle of a set of statements).

The fix is simple (this also corrects return code; for init functions it
should be zero or error).
---

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index d74b99dab7..e60f9338e4 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;