diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 07:02:40 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 07:02:40 +0000 |
| commit | 8bc181f5069dc14b657a474446d73491fa60fbf4 (patch) | |
| tree | 829c529a6b3222fb3272931acdcea660bd9fce61 /lib/libcam | |
| parent | 1b355c2dc7329f4aa0686562862841243e3505fc (diff) | |
Notes
Diffstat (limited to 'lib/libcam')
| -rw-r--r-- | lib/libcam/camlib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c index c62d3a6c8ce0..88191ee9f4df 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; + int fd, rc; union ccb ccb; char dev_path[256]; char *func_name = "cam_lookup_pass"; @@ -494,7 +494,10 @@ 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. */ - if (ioctl(fd, CAMGETPASSTHRU, &ccb) == -1) { + rc = ioctl(fd, CAMGETPASSTHRU, &ccb); + close(fd); + + if (rc == -1) { char tmpstr[256]; /* @@ -517,8 +520,6 @@ cam_lookup_pass(const char *dev_name, int unit, int flags, 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 |