summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-08-28 14:05:20 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-08-28 14:05:20 +0000
commit81cd377d99d03e0781a781af76fc73d9502051de (patch)
tree79f6b4c6fddaee804e98081c022341659de5d7d3
parent2007-08-28 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-81cd377d99d03e0781a781af76fc73d9502051de.tar.bz2
2007-08-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* ChangeLog, sapi/src/io.c: Revert change accidentally committed to io.c.
-rw-r--r--cpukit/ChangeLog7
-rw-r--r--cpukit/sapi/src/io.c11
2 files changed, 11 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index a8f5e53a1d..78d035b0ae 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,7 +1,12 @@
2007-08-28 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * ChangeLog, sapi/src/io.c: Revert change accidentally committed to
+ io.c.
+
+2007-08-28 Joel Sherrill <joel.sherrill@OARcorp.com>
+
PR 1256/networking
- * ftpd/ftpd.c, sapi/src/io.c: Fix unaligned access.
+ * ftpd/ftpd.c: Fix unaligned access.
2007-07-31 Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/cpukit/sapi/src/io.c b/cpukit/sapi/src/io.c
index c989711535..823427fd47 100644
--- a/cpukit/sapi/src/io.c
+++ b/cpukit/sapi/src/io.c
@@ -136,16 +136,15 @@ rtems_status_code rtems_io_register_driver(
if ( major == 0 )
{
- bool found = FALSE;
for ( major = _IO_Number_of_drivers - 1 ; major ; major-- )
if ( _IO_Driver_address_table[major].initialization_entry == 0 &&
- _IO_Driver_address_table[major].open_entry == 0 ) {
- found = FALSE;
+ _IO_Driver_address_table[major].open_entry == 0 )
break;
- }
- if ( !found )
- return RTEMS_TOO_MANY;
+ if (( major == 0 ) &&
+ ( _IO_Driver_address_table[major].initialization_entry == 0 &&
+ _IO_Driver_address_table[major].open_entry == 0 ))
+ return RTEMS_TOO_MANY;
}
if ( _IO_Driver_address_table[major].initialization_entry == 0 &&