tree 385e241e0cc18794b8d8b70095181e2578bee14c
parent a2755a80f40e5794ddc20e00f781af9d6320fafb
author James Bottomley <[EMAIL PROTECTED]> Thu, 21 Apr 2005 21:35:45 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Thu, 21 Apr 2005 21:35:45 -0700

[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). 


 scsi/aic7xxx/aic7xxx_osm.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Index: drivers/scsi/aic7xxx/aic7xxx_osm.c
===================================================================
--- 1813b464853cba4439b3c30412059ed6284114a0/drivers/scsi/aic7xxx/aic7xxx_osm.c 
 (mode:100644 sha1:d74b99dab7ec8d11003a176fa4685f2b9f85c4ae)
+++ 385e241e0cc18794b8d8b70095181e2578bee14c/drivers/scsi/aic7xxx/aic7xxx_osm.c 
 (mode:100644 sha1:e60f9338e44ad4a2eb938adcc70a491c9a09815d)
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to