d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Go with a different version of the previous patch so to preserve errno.

Browse Source 
Approved by:	scottl (implicit)
This commit is contained in:
Joe Marcus Clarke 2006-04-30 07:08:43 +00:00
parent 8bc181f506
commit a7a6dfbd14
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=158171
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libcam/camlib.c
View File

@ -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