summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJennifer Averett <Jennifer.Averett@OARcorp.com>2003-08-05 20:26:09 +0000
committerJennifer Averett <Jennifer.Averett@OARcorp.com>2003-08-05 20:26:09 +0000
commit8d49b7c43fd4b916ae60000d21f42ebed49071a5 (patch)
tree35aa5b8cdb6fead1a80005821372493277aa8966
parent2003-08-05 Till Strauman <strauman@slac.stanford.edu> (diff)
downloadrtems-8d49b7c43fd4b916ae60000d21f42ebed49071a5.tar.bz2
2003-08-05 <djc915@mail.usask.ca>
PR 443/filesystem * src/imfs/deviceio.c: deviceio.c mishandles return codes
-rw-r--r--cpukit/libfs/ChangeLog5
-rw-r--r--cpukit/libfs/src/imfs/deviceio.c11
2 files changed, 9 insertions, 7 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index c1c311d95e..56c7390618 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-05 <djc915@mail.usask.ca>
+
+ PR 443/filesystem
+ * src/imfs/deviceio.c: deviceio.c mishandles return codes
+
2003-08-05 Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
PR 440/filesystem
diff --git a/cpukit/libfs/src/imfs/deviceio.c b/cpukit/libfs/src/imfs/deviceio.c
index 0d4286ab8c..f7631916fd 100644
--- a/cpukit/libfs/src/imfs/deviceio.c
+++ b/cpukit/libfs/src/imfs/deviceio.c
@@ -43,7 +43,7 @@ rtems_assoc_t errno_assoc[] = {
{ 0, 0, 0 },
};
-static unsigned32
+static int
rtems_deviceio_errno(rtems_status_code code)
{
int rc;
@@ -84,10 +84,8 @@ int device_open(
the_jnode->info.device.minor,
(void *) &args
);
- if ( status ) {
- rtems_deviceio_errno(status);
- return RTEMS_UNSATISFIED;
- }
+ if ( status )
+ return rtems_deviceio_errno(status);
return 0;
}
@@ -118,8 +116,7 @@ int device_close(
(void *) &args
);
if ( status ) {
- rtems_deviceio_errno(status);
- return RTEMS_UNSATISFIED;
+ return rtems_deviceio_errno(status);
}
return 0;
}