Commit 858eaca1 authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds

[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). 
parent a2755a80
...@@ -3605,9 +3605,8 @@ ahc_linux_init(void) ...@@ -3605,9 +3605,8 @@ ahc_linux_init(void)
ahc_linux_transport_template = spi_attach_transport(&ahc_linux_transport_functions); ahc_linux_transport_template = spi_attach_transport(&ahc_linux_transport_functions);
if (!ahc_linux_transport_template) if (!ahc_linux_transport_template)
return -ENODEV; return -ENODEV;
int rc = ahc_linux_detect(&aic7xxx_driver_template); if (ahc_linux_detect(&aic7xxx_driver_template))
if (rc) return 0;
return rc;
spi_release_transport(ahc_linux_transport_template); spi_release_transport(ahc_linux_transport_template);
ahc_linux_exit(); ahc_linux_exit();
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment