aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2005-04-21 10:35:45 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-21 10:35:45 -0400
commit858eaca169ed5e7b1b14eebb889323e75a02af0e (patch)
tree385e241e0cc18794b8d8b70095181e2578bee14c
parenta2755a80f40e5794ddc20e00f781af9d6320fafb (diff)
[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).
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index d74b99dab7ec..e60f9338e44a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -3605,9 +3605,8 @@ ahc_linux_init(void)
3605 ahc_linux_transport_template = spi_attach_transport(&ahc_linux_transport_functions); 3605 ahc_linux_transport_template = spi_attach_transport(&ahc_linux_transport_functions);
3606 if (!ahc_linux_transport_template) 3606 if (!ahc_linux_transport_template)
3607 return -ENODEV; 3607 return -ENODEV;
3608 int rc = ahc_linux_detect(&aic7xxx_driver_template); 3608 if (ahc_linux_detect(&aic7xxx_driver_template))
3609 if (rc) 3609 return 0;
3610 return rc;
3611 spi_release_transport(ahc_linux_transport_template); 3610 spi_release_transport(ahc_linux_transport_template);
3612 ahc_linux_exit(); 3611 ahc_linux_exit();
3613 return -ENODEV; 3612 return -ENODEV;