diff options
Diffstat (limited to 'sys/boot/common/devopen.c')
| -rw-r--r-- | sys/boot/common/devopen.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c index 28a2fab..7526141 100644 --- a/sys/boot/common/devopen.c +++ b/sys/boot/common/devopen.c @@ -35,20 +35,25 @@ __FBSDID("$FreeBSD$"); int devopen(struct open_file *f, const char *fname, const char **file) { - struct devdesc *dev; - int result; - - if ((result = archsw.arch_getdev((void *)&dev, fname, file)) == 0) { /* get the device */ - /* point to device-specific data so that device open can use it */ - f->f_devdata = dev; - if ((result = dev->d_dev->dv_open(f, dev)) == 0) { /* try to open it */ - /* reference the devsw entry from the open_file structure */ - f->f_dev = dev->d_dev; - } else { - free(dev); /* release the device descriptor */ - } + struct devdesc *dev; + int result; + + result = archsw.arch_getdev((void **)&dev, fname, file); + if (result) + return (result); + + /* point to device-specific data so that device open can use it */ + f->f_devdata = dev; + result = dev->d_dev->dv_open(f, dev); + if (result != 0) { + f->f_devdata = NULL; + free(dev); + return (result); } - return(result); + + /* reference the devsw entry from the open_file structure */ + f->f_dev = dev->d_dev; + return (0); } int |
