summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2005-04-21 07:35:45 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-21 07:35:45 -0700
commit858eaca169ed5e7b1b14eebb889323e75a02af0e (patch)
tree385e241e0cc18794b8d8b70095181e2578bee14c /drivers
parenta2755a80f40e5794ddc20e00f781af9d6320fafb (diff)
downloadlinux-858eaca169ed5e7b1b14eebb889323e75a02af0e.tar.bz2
[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).
Diffstat (limited to 'drivers')
-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)
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;