diff options
Diffstat (limited to 'lib/libcam/camlib.c')
| -rw-r--r-- | lib/libcam/camlib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c index 88191ee..b252371 100644 --- a/lib/libcam/camlib.c +++ b/lib/libcam/camlib.c @@ -465,7 +465,7 @@ static struct cam_device * cam_lookup_pass(const char *dev_name, int unit, int flags, const char *given_path, struct cam_device *device) { - int fd, rc; + int fd; union ccb ccb; char dev_path[256]; char *func_name = "cam_lookup_pass"; @@ -494,10 +494,7 @@ cam_lookup_pass(const char *dev_name, int unit, int flags, * the device name is null, if the device doesn't exist, or if the * passthrough driver isn't in the kernel. */ - rc = ioctl(fd, CAMGETPASSTHRU, &ccb); - close(fd); - - if (rc == -1) { + if (ioctl(fd, CAMGETPASSTHRU, &ccb) == -1) { char tmpstr[256]; /* @@ -517,9 +514,12 @@ cam_lookup_pass(const char *dev_name, int unit, int flags, "%s: %s%s", func_name, func_name, strerror(errno), (errno == ENOENT) ? tmpstr : ""); + close(fd); return(NULL); } + close(fd); + /* * If the ioctl returned the right status, but we got an error back * in the ccb, that means that the kernel found the device the user |
