[rtems commit] bdpart: Argument cannot be negative

[Gedare Bloom]

Module:    rtems
Branch:    master
Commit:    121dd88103d306760c43a06bc27b3641b68cf542
Changeset: http://git.rtems.org/rtems/commit/?id=121dd88103d306760c43a06bc27b3641b68cf542

Author:    Gedare Bloom <gedare at rtems.org>
Date:      Thu Sep  5 13:22:49 2013 -0400

bdpart: Argument cannot be negative

If open(fd) fails then avoid the error path that calls close(fd).

---

 cpukit/libblock/src/bdpart-read.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cpukit/libblock/src/bdpart-read.c b/cpukit/libblock/src/bdpart-read.c
index fd8a038..cfb31d5 100644
--- a/cpukit/libblock/src/bdpart-read.c
+++ b/cpukit/libblock/src/bdpart-read.c
@@ -74,7 +74,7 @@ rtems_status_code rtems_bdpart_get_disk_data(
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
   int rv = 0;
-  int fd = -1;
+  int fd;
   rtems_disk_device *dd = NULL;
   rtems_blkdev_bnum disk_begin = 0;
   rtems_blkdev_bnum block_size = 0;
@@ -83,7 +83,7 @@ rtems_status_code rtems_bdpart_get_disk_data(
   fd = open( disk_name, O_RDWR);
   if (fd < 0) {
     sc = RTEMS_INVALID_NAME;
-    goto error;
+    goto out;
   }
 
   /* Get disk handle */
@@ -119,6 +119,7 @@ error:
     close( fd);
   }
 
+out:
   return sc;
 }